ejoffe / spr

Stacked Pull Requests on GitHub
MIT License
717 stars 65 forks source link

Automatically determining `origin/main`, `origin/master`, etc. #320

Closed ggoretkin-bdai closed 1 year ago

ggoretkin-bdai commented 1 year ago

spr assumes the default of origin/master, which is inconsistent with the current (as of 2 or so years) default in Git and GitHub. Perhaps it can be done only heuristically, or special-cased to these two common choices, but it would be great to have an out-of-the-box experience that works in the case that the remote branch is main.

git spr update
rake: config file /home/ggoretkin/repos/foo/.spr.yml not found
rake: config file /home/ggoretkin/.spr.yml not found
rake: config file /home/ggoretkin/.spr.state not found
> git rev-parse --show-toplevel
> git fetch
> git branch --no-color
> git rebase origin/master --autostash
git error: fatal: invalid upstream 'origin/master'