From c6fd5a6ed8b9817eb37206b9ceafb1b4462dbdc1 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 26 Jun 2012 13:42:11 +0900 Subject: [PATCH] Correct documentation of "invalid author/committer" errors The error messages "you are not committer ..." and "you are not author ..." were replaced with "invalid author" and "invalid committer" in change ed2d1b16, but the corresponding documentation was not updated. Rename the files and update with the correct error messages. Change-Id: Ia62affe14cb3c4411479f8c8d83880eac784a959 --- ...are-not-author.txt => error-invalid-author.txt} | 14 +++++++------- ...t-committer.txt => error-invalid-committer.txt} | 14 +++++++------- Documentation/error-messages.txt | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) rename Documentation/{error-you-are-not-author.txt => error-invalid-author.txt} (92%) rename Documentation/{error-you-are-not-committer.txt => error-invalid-committer.txt} (90%) diff --git a/Documentation/error-you-are-not-author.txt b/Documentation/error-invalid-author.txt similarity index 92% rename from Documentation/error-you-are-not-author.txt rename to Documentation/error-invalid-author.txt index 13de5d8bff..c484776a78 100644 --- a/Documentation/error-you-are-not-author.txt +++ b/Documentation/error-invalid-author.txt @@ -1,10 +1,10 @@ -you are not author ... -====================== +invalid author +============== For every pushed commit Gerrit verifies that the e-mail address of the author matches one of the registered e-mail addresses of the pushing user. If this is not the case pushing the commit fails with -the error message "you are not author ...". This policy can be +the error message "invalid author". This policy can be bypassed by having the access right link:access-control.html#category_forge_author['Forge Author']. @@ -17,8 +17,8 @@ This error may happen for two reasons: Incorrect configuration of the e-mail address on client or server side ---------------------------------------------------------------------- -If pushing to Gerrit fails with the error message "you are not -author ..." and you are the author of the commit for which the push +If pushing to Gerrit fails with the error message "invalid author" +and you are the author of the commit for which the push fails, then either you have not successfully registered this e-mail address for your Gerrit account or the author information of the pushed commit is incorrect. @@ -131,8 +131,8 @@ link:http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html[Git documen Missing privileges to push commits of other users ------------------------------------------------- -If pushing to Gerrit fails with the error message "you are not -author ..." and somebody else is author of the commit for which the +If pushing to Gerrit fails with the error message "invalid author" +and somebody else is author of the commit for which the push fails, then you have no permissions to forge the author identity. In this case you may contact the project owner to request the access right '+1 Forge Author Identity' in the 'Forge Identity' diff --git a/Documentation/error-you-are-not-committer.txt b/Documentation/error-invalid-committer.txt similarity index 90% rename from Documentation/error-you-are-not-committer.txt rename to Documentation/error-invalid-committer.txt index 57229ba703..447064efdb 100644 --- a/Documentation/error-you-are-not-committer.txt +++ b/Documentation/error-invalid-committer.txt @@ -1,10 +1,10 @@ -you are not committer ... -========================= +invalid committer +================= For every pushed commit Gerrit verifies that the e-mail address of the committer matches one of the registered e-mail addresses of the pushing user. If this is not the case pushing the commit fails with -the error message "you are not committer ...". This policy can be +the error message "invalid committer". This policy can be bypassed by having the access right link:access-control.html#category_forge_committer['Forge Committer']. @@ -19,8 +19,8 @@ This error may happen for two reasons: Incorrect configuration of the e-mail address on client or server side ---------------------------------------------------------------------- -If pushing to Gerrit fails with the error message "you are not -committer ..." and you committed the change for which the push fails, +If pushing to Gerrit fails with the error message "invalid committer" +and you committed the change for which the push fails, then either you have not successfully registered this e-mail address for your Gerrit account or the committer information of the pushed commit is incorrect. @@ -96,8 +96,8 @@ link:http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html[Git documen Missing privileges to push commits that were committed by other users --------------------------------------------------------------------- -If pushing to Gerrit fails with the error message "you are not -committer ..." and somebody else committed the change for which the +If pushing to Gerrit fails with the error message "invalid committer" +and somebody else committed the change for which the push fails, then you have no permissions to forge the committer identity. In this case you may contact the project owner to request the access right '+2 Forge Committer or Tagger Identity' in the diff --git a/Documentation/error-messages.txt b/Documentation/error-messages.txt index f915a14b13..4b62795980 100644 --- a/Documentation/error-messages.txt +++ b/Documentation/error-messages.txt @@ -33,8 +33,8 @@ Error Messages * link:error-squash-commits-first.html[squash commits first] * link:error-upload-denied.html[Upload denied for project \'...'] * link:error-not-allowed-to-upload-merges.html[you are not allowed to upload merges] -* link:error-you-are-not-author.html[you are not author ...] -* link:error-you-are-not-committer.html[you are not committer ...] +* link:error-invalid-author.html[invalid author] +* link:error-invalid-committer.html[invalid committer] General Hints