search

twmr / gerrit.el

gerrit integration in emacs
44 stars 5 forks source link

Stash changes before calling git-review #4

Closed twmr closed 3 years ago

twmr commented 4 years ago

If git-review is called with unstaged changes, I get the following output:

Errors running git rebase -p -i remotes/origin/version10
error: cannot rebase: You have unstaged changes.
error: Please commit or stash them.
It is likely that your change has a merge conflict. You may resolve it
in the working tree now as described above and then run 'git review'
again, or if you do not want to resolve it yet (note that the change
can not merge until the conflict is resolved) you may run 'git rebase
--abort' then 'git review -R' to upload the change without rebasing.

gerrit.el should temporarily stash changes before calling git-review.

I'll try to fix this issue in git-review.

twmr commented 3 years ago

Let's close this, since I don't plan to fix this issue anymore in git-review. The REST interface (setq gerrit-use-gitreview-interface nil) doesn't have this issue.