From 947d666b3ba15d5c74fa3059b39951d805bf0898 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Mon, 27 Dec 2010 13:33:09 +0100 Subject: [PATCH] added explanation for "multiple Change-Id lines" error Added a documentation page that explains the "multiple Change-Id lines in commit message" error in details and what can be done to solve the problem. Signed-off-by: Edwin Kempin Change-Id: I0c6f98a41f5b8ba56d2b3e1ebf0407c03e0e1489 --- Documentation/error-messages.txt | 1 + .../error-multiple-changeid-lines.txt | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 Documentation/error-multiple-changeid-lines.txt diff --git a/Documentation/error-messages.txt b/Documentation/error-messages.txt index 1e95f3a072..49511e4d59 100644 --- a/Documentation/error-messages.txt +++ b/Documentation/error-messages.txt @@ -10,6 +10,7 @@ Error Messages -------------- * link:error-missing-changeid.html[missing Change-Id in commit message] +* link:error-multiple-changeid-lines.html[multiple Change-Id lines in commit message] * link:error-squash-commits-first.html[squash commits first] * link:error-you-are-not-author.html[you are not author ...] * link:error-you-are-not-committer.html[you are not committer ...] diff --git a/Documentation/error-multiple-changeid-lines.txt b/Documentation/error-multiple-changeid-lines.txt new file mode 100644 index 0000000000..e6049742cf --- /dev/null +++ b/Documentation/error-multiple-changeid-lines.txt @@ -0,0 +1,31 @@ +multiple Change-Id lines in commit message +========================================== + +With this error message Gerrit rejects to push a commit if the commit +message of the pushed commit contains several Change-Id lines. + +You can see the commit messages for existing commits in the history +by doing a link:http://www.kernel.org/pub/software/scm/git/docs/git-log.html[git log]. + +If it was the intention to rework a change and to push a new patch +set, find the change in the Gerrit WebUI, copy its Change-Id line and +use the copied Change-Id line instead of the existing Change-Id lines +in the commit message of the commit for which the push is failing. +How to do this is explained link:error-push-fails-due-to-commit-message.html#commit_hook[here]. + +If it was the intention to create a new change in Gerrit simply +remove all Change-Id lines from the commit message of the +commit for which the push is failing. How to do this is explained +link:error-push-fails-due-to-commit-message.html#commit_hook[here]. In case you have configured the link:cmd-hook-commit-msg.html[commit hook] a new Change-Id +will be automatically generated and inserted. + + +SEE ALSO +-------- + +* link:user-changeid.html[Change-Id Lines] + + +GERRIT +------ +Part of link:error-messages.html[Gerrit Error Messages]