diff --git a/Documentation/access-control.txt b/Documentation/access-control.txt index 0ba0500010..41745c9f09 100644 --- a/Documentation/access-control.txt +++ b/Documentation/access-control.txt @@ -490,43 +490,58 @@ you grant the users the push force permission to be able to clean up stale branches. -[[category_FORG]] -Forge Identity -~~~~~~~~~~~~~~ + +[[category_forge_author]] +Forge Author +~~~~~~~~~~~~ Normally Gerrit requires the author and the committer identity lines in a Git commit object (or tagger line in an annotated tag) to match one of the registered email addresses of the uploading user. -This permission allows users to bypass that validation, which may -be necessary when mirroring changes from an upstream project. +This permission allows users to bypass parts of that validation, which +may be necessary when mirroring changes from an upstream project. -* +1 Forge Author Identity -+ Permits the use of an unverified author line in commit objects. This can be useful when applying patches received by email from 3rd parties, when cherry-picking changes written by others across branches, or when amending someone else's commit to fix up a minor problem before submitting. -+ + By default this is granted to `Registered Users` in all projects, but a site administrator may disable it if verified authorship is required. -* +2 Forge Committer or Tagger Identity -+ -Implies 'Forge Author Identity', but also allows the use of an -unverified committer line in commit objects, or an unverified tagger -line in annotated tag objects. Typically this is only required -when mirroring commits from an upstream project repository. -* +3 Forge Gerrit Code Review Server Identity -+ -Implies 'Forge Committer or Tagger Identity' as well as 'Forge -Author Identity', but additionally allows the use of the server's -own name and email on the committer line of a new commit object. -This should only be necessary when force pushing a commit history -which has been rewritten by 'git filter-branch' and that contains -merge commits previously created by this Gerrit Code Review server. +[[category_forge_committer]] +Forge Committer +~~~~~~~~~~~~~~~ + +Normally Gerrit requires the author and the committer identity +lines in a Git commit object (or tagger line in an annotated tag) to +match one of the registered email addresses of the uploading user. +This permission allows users to bypass parts of that validation, which +may be necessary when mirroring changes from an upstream project. + +Allows the use of an unverified committer line in commit objects, or an +unverified tagger line in annotated tag objects. Typically this is only +required when mirroring commits from an upstream project repository. + + +[[category_forge_server]] +Forge Server +~~~~~~~~~~~~ + +Normally Gerrit requires the author and the committer identity +lines in a Git commit object (or tagger line in an annotated tag) to +match one of the registered email addresses of the uploading user. +This permission allows users to bypass parts of that validation, which +may be necessary when mirroring changes from an upstream project. + +Allows the use of the server's own name and email on the committer +line of a new commit object. This should only be necessary when force +pushing a commit history which has been rewritten by 'git filter-branch' +and that contains merge commits previously created by this Gerrit Code +Review server. [[category_OWN]] Owner diff --git a/Documentation/error-not-signed-off-by.txt b/Documentation/error-not-signed-off-by.txt index 4f887741a4..00f179b0f2 100644 --- a/Documentation/error-not-signed-off-by.txt +++ b/Documentation/error-not-signed-off-by.txt @@ -7,8 +7,8 @@ author, committer or uploader. If for a project a Signed-off-by is required and the commit message does not contain it, Gerrit rejects to push the commit with this error message. -This policy can be bypassed by having the access right '+2 Forge -Committer or Tagger Identity' in the link:access-control.html#category_FORG['Forge Identity'] category. +This policy can be bypassed by having the access right +link:access-control.html#category_forge_committer['Forge Committer']. This error may happen for different reasons if you do not have the access right to forge the committer identity: diff --git a/Documentation/error-you-are-not-author.txt b/Documentation/error-you-are-not-author.txt index 47a76528fc..8c53262364 100644 --- a/Documentation/error-you-are-not-author.txt +++ b/Documentation/error-you-are-not-author.txt @@ -5,8 +5,8 @@ Gerrit verifies for every pushed commit 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 -bypassed by having the access right '+1 Forge Author Identity' in the -link:access-control.html#category_FORG['Forge Identity'] category. +bypassed by having the access right +link:access-control.html#category_forge_author['Forge Author']. This error may happen for two reasons: diff --git a/Documentation/error-you-are-not-committer.txt b/Documentation/error-you-are-not-committer.txt index 26e0cae564..b5b8c44aed 100644 --- a/Documentation/error-you-are-not-committer.txt +++ b/Documentation/error-you-are-not-committer.txt @@ -5,8 +5,8 @@ Gerrit verifies for every pushed commit 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 -bypassed by having the access right '+2 Forge Committer or Tagger -Identity' in the link:access-control.html#category_FORG['Forge Identity'] category. +bypassed by having the access right +link:access-control.html#category_forge_committer['Forge Committer']. This error may happen for two reasons: