opendev/gerrit
Code Issues Proposed changes

Merge "For deleting a branch, the "Delete Reference" permission is sufficient." into stable-2.14

Browse Source
This commit is contained in:
Edwin Kempin
2017-10-20 06:31:13 +00:00
committed by Gerrit Code Review
parent 24ffa9350d 8c5e33ce11
commit dd72e61f48
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/access-control.txt
View File

@@ -602,7 +602,7 @@ safest mode as commits cannot be discarded.
* Force option * Force option
+ +
Allows an existing branch to be deleted. Since a force push is Implies <<category_delete,Delete Reference>>. Since a force push is
effectively a delete immediately followed by a create, but performed effectively a delete immediately followed by a create, but performed
atomically on the server and logged, this option also permits forced atomically on the server and logged, this option also permits forced
push updates to branches. Enabling this option allows existing commits push updates to branches. Enabling this option allows existing commits

9
Documentation/project-configuration.txt
View File

@@ -272,13 +272,20 @@ There are several ways to delete a branch:
- in the Web UI under 'Projects' > 'List' > <project> > 'Branches' - in the Web UI under 'Projects' > 'List' > <project> > 'Branches'
- via the link:rest-api-projects.html#delete-branch[Delete Branch] - via the link:rest-api-projects.html#delete-branch[Delete Branch]
REST endpoint REST endpoint
- by using a git client to force push nothing to an existing branch - by using a git client
+
----
$ git push origin --delete refs/heads/<branch-to-delete>
----
+
another method, by force pushing nothing to an existing branch:
+ +
---- ----
$ git push --force origin :refs/heads/<branch-to-delete> $ git push --force origin :refs/heads/<branch-to-delete>
---- ----
To be able to delete branches, the user must have the To be able to delete branches, the user must have the
link:access-control.html#category_delete[Delete Reference] or the
link:access-control.html#category_push[Push] access right with the link:access-control.html#category_push[Push] access right with the
`force` option. In addition, project owners and Gerrit administrators `force` option. In addition, project owners and Gerrit administrators
can delete branches from the Web UI or via REST even without having the can delete branches from the Web UI or via REST even without having the

3
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -201,7 +201,8 @@ public class ReceiveCommits {
UPDATE( UPDATE(
"You are not allowed to perform this operation.\n" "You are not allowed to perform this operation.\n"
+ "To push into this reference you need 'Push' rights."), + "To push into this reference you need 'Push' rights."),
DELETE("You need 'Push' rights with the 'Force Push'\nflag set to delete references."), DELETE("You need 'Delete Reference' rights or 'Push' rights with the \n"
+ "'Force Push' flag set to delete references."),
DELETE_CHANGES("Cannot delete from '" + REFS_CHANGES + "'"), DELETE_CHANGES("Cannot delete from '" + REFS_CHANGES + "'"),
CODE_REVIEW( CODE_REVIEW(
"You need 'Push' rights to upload code review requests.\n" "You need 'Push' rights to upload code review requests.\n"