Gerrit重复请求被拒绝

时间:2016-08-08 22:35:55

标签: git gerrit

我修改了一些文件,进行了新的提交,然后键入了git pull 然后git自动进行了一个空的新合并提交! 所以我做了git rebase试图摆脱它。 而空提交现在已经消失。

但现在当我git review时,我得到了

You are about to submit multiple commits. This is expected if you are
submitting a commit that is dependent on one or more in-review
commits. Otherwise you should consider squashing your changes into one
commit before submitting.

The outstanding commits are:

←[33me4b3f96←[m←[33m (←[m←[1;36mHEAD←[m←[33m -> ←[m←[1;32mmaster←[m←[33m)←[m unit tester fixes
←[33mbc61468←[m Addded test cases to ...
←[33me21d8c7←[m Added test cases to the 
←[33ma8d2919←[m added another test case
←[33m938ef4f←[m Modified a few tests
←[33mbee5ba1←[m FA initial

Do you really want to submit the above commits?
Type 'yes' to confirm, other to cancel: yes
remote: Resolving deltas: 100% (38/38)
remote: Processing changes: refs: 1, done
remote: (W) bc61468: commit subject >65 characters; use shorter first paragraph
remote: (W) bc61468: commit message lines >70 characters; manually wrap lines
To ssh://jkl@review-thing.bo.com:29418/IM
 ! [remote rejected] HEAD -> refs/publish/master (duplicate request)
error: failed to push some refs to 'ssh://jkl@review-thing.bo.com:29418/IM'

如何找出重复请求的原因?我不明白为什么会这样。我尝试了各种各样的事情无济于事。

1 个答案:

答案 0 :(得分:3)

没关系。 所以我的承诺"增加了另一个测试用例"具有与提交相同的更改ID"修改了一些测试"。我已将更改ID设置为相同,以便它在上一次提交gerrit时显示为补丁集。 但似乎gerrit希望你把变化压缩成一个提交。

所以我压扁了他们,现在我没有得到重复的错误。