ejoffe / spr

Stacked Pull Requests on GitHub
MIT License
829 stars 68 forks source link

spr sync: status shows error state when it should show "in sync" #429

Open canadaduane opened 2 weeks ago

canadaduane commented 2 weeks ago

Note: I'm new to spr, so I may not understand the complete picture below.

I have a single branch and associated PR on github. They are in sync. When I run git spr sync, instead of telling me they are in sync, I get an error message:

❯ git spr sync
> git rev-parse --show-toplevel
> github fetch pull requests
> git log --format=medium --no-color origin/main..HEAD
> git branch --no-color
> git cherry-pick ..49b79832177c05dba824f4bc7f7dcbdac7a2ce5d
git error: error: empty commit set passed
fatal: cherry-pick failed
error: exit status 128

First, I think it should show that they are in sync--is that a correct assumption?

Second, if that's correct, maybe I can look into fixing. Thanks.

ggalmazor commented 4 days ago

I'm getting the same error. In my case, it's both in the scenario where my local is in sync with the remote, and also when the remote has received new commits in a PR within the stack