git review报错一例

在线上修改代码，最后使用git review提交代码审核的时候出现报错如下： [wangshibo@115~]$ vim testfile           #修改代码 [wangshibo@115~]$ git add testfile [wangshibo@115~]$ git commit -m "123" [wangshibo@115~ ]$ git review Errors running git rebase -i remotes/gerrit/master Interactive rebase already started .....

解决办法： [wangshibo@115~]$ git review -v 2016-07-19 15:37:49.838087 Running: git log --color=never --oneline HEAD^1..HEAD 2016-07-19 15:37:49.841756 Running: git remote 2016-07-19 15:37:49.844743 Running: git branch -a --color=never 2016-07-19 15:37:49.847957 Running: git rev-parse --show-toplevel --git-dir 2016-07-19 15:37:49.850729 Running: git remote update gerrit Fetching gerrit 2016-07-19 15:37:49.962033 Running: git rebase -i remotes/gerrit/master Errors running git rebase -i remotes/gerrit/master Interactive rebase already started

使用“git rebase -i --abort”命令重来：

[wangshibo@115~]$ git rebase -i --abort [wangshibo@115~]$ git review -v 2016-07-19 15:39:02.470947 Running: git log --color=never --oneline HEAD^1..HEAD 2016-07-19 15:39:02.474624 Running: git remote 2016-07-19 15:39:02.477638 Running: git branch -a --color=never 2016-07-19 15:39:02.480825 Running: git rev-parse --show-toplevel --git-dir 2016-07-19 15:39:02.483649 Running: git remote update gerrit Fetching gerrit 2016-07-19 15:39:02.595045 Running: git rebase -i remotes/gerrit/master Errors running git rebase -i remotes/gerrit/master Automatic cherry-pick failed. After resolving the conflicts, mark the corrected paths with 'git add <paths>', and run 'git rebase --continue' Could not apply 0e37bdc... test

[wangshibo@115~]$ git add testfile [wangshibo@115~]$ git rebase --continue # 继续变基并且返回到原来的HEAD处 [detached HEAD d854154] test 1 files changed, 4 insertions(+), 0 deletions(-) Successfully rebased and updated refs/heads/master.

[wangshibo@115~]$ git commit -m "123" # On branch master # Your branch is ahead of 'origin/master' by 1 commit. # nothing to commit (working directory clean)

最后再次git review就成功了 [wangshibo@115~]$ git review remote: Resolving deltas: 100% (1/1) remote: Processing changes: new: 1, refs: 1, done remote: remote: New Changes: remote: http://103.10.86.30:80/16 test remote: To ssh://wangshibo@103.10.86.30:29418/xqsj_android.git * [new branch] HEAD -> refs/publish/master