opendev
/
gerrit
Code Issues Proposed changes

Clarify documentation of "no new changes" error message 

Update the documentation to clarify that it is necessary to
replace the Change-Id when re-pushing a commit to the same
destination branch. Previously the documentation also implied
that this was necessary when pushing to a different branch.

Bug: Issue 8222
Change-Id: I4a7f87322c7117f34d2ea3a8be8eec4b38fa406a
This commit is contained in:
David Pursehouse 2018-01-26 08:49:52 +09:00
parent 7ebead3137
commit 905cb4e79f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/error-no-new-changes.txt
View File

@ -40,10 +40,11 @@ means:
If you need to re-push a commit you may rewrite this commit by
link:http://www.kernel.org/pub/software/scm/git/docs/git-commit.html[amending] it or doing an interactive link:http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html[git rebase]. By rewriting the
commit you actually create a new commit (with a new commit ID in
project scope) which can then be pushed to Gerrit. If the old commit
contains a Change-Id in the commit message you also need to replace
it with a new Change-Id (case 1. and 3. above), otherwise the push
will fail with another error message.
project scope) which can then be pushed to Gerrit.
If you are pushing the new change to the same destination branch as
the old commit (case 1 above), you also need to replace it with a new
Change-Id, otherwise the push will fail with another error message.
== Fast-forward merges