opendev/gerrit
Code Issues Proposed changes

access-control.txt: Clarify the ref format for Push Merge Commit

Browse Source 
Elaborate on the required format of the ref used for Push Merge Commit
access right entries to avoid user confusion when granting access to
refs/heads/* still doesn't allow them to push any merge commits.

Change-Id: Ie98f6e64afff762ed6eb5d04348be7354f657064
This commit is contained in:
Magnus Bäck
2012-04-18 15:39:17 -04:00
parent cff5ccb3fc
commit 282c102ec4
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Documentation/access-control.txt
View File

@@ -622,13 +622,19 @@ The force option has no function when granted to a branch in the
Push Merge Commits Push Merge Commits
~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~
The `Push Merge Commit` permits the user to upload merge commits. The `Push Merge Commit` access right permits the user to upload merge
It's an addon to the <<category_push,Push>> access right, and so it commits. It's an addon to the <<category_push,Push>> access right, and
won't be sufficient with only `Push Merge Commit` granted for a push so it won't be sufficient with only `Push Merge Commit` granted for a
to happen. Some projects wish to restrict merges to being created by push to happen. Some projects wish to restrict merges to being created
Gerrit. By granting `Push` without `Push Merge Commit`, the only by Gerrit. By granting `Push` without `Push Merge Commit`, the only
merges that enter the system will be those created by Gerrit. merges that enter the system will be those created by Gerrit.
The reference name connected to a `Push Merge Commit` entry must always
be prefixed with `refs/for/`, for example `refs/for/refs/heads/BRANCH`.
This applies even for an entry that complements a `Push` entry for
`refs/heads/BRANCH` that allows direct pushes of non-merge commits, and
the intention of the `Push Merge Commit` entry is to allow direct pushes
of merge commits.
[[category_push_annotated]] [[category_push_annotated]]
Push Annotated Tag Push Annotated Tag