Improve ticket branch ref deletion push handling

1 files changed, 15 insertions, 0 deletions

diff --git a/src/main/java/com/gitblit/git/PatchsetReceivePack.java b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
index 77d5a71e..43efc54a 100644
--- a/src/main/java/com/gitblit/git/PatchsetReceivePack.java
+++ b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
@@ -309,6 +309,7 @@ public class PatchsetReceivePack extends GitblitReceivePack {
 			}

 

 			if (isPatchsetRef(cmd.getRefName()) && processPatchsets) {

+

 				if (ticketService == null) {

 					sendRejection(cmd, "Sorry, the ticket service is unavailable and can not accept patchsets at this time.");

 					continue;

@@ -346,6 +347,20 @@ public class PatchsetReceivePack extends GitblitReceivePack {
 					continue;

 				}

 

+				if (cmd.getNewId().equals(ObjectId.zeroId())) {

+					// ref deletion request

+					if (cmd.getRefName().startsWith(Constants.R_TICKET)) {

+						if (user.canDeleteRef(repository)) {

+							batch.addCommand(cmd);

+						} else {

+							sendRejection(cmd, "Sorry, you do not have permission to delete {}", cmd.getRefName());

+						}

+					} else {

+						sendRejection(cmd, "Sorry, you can not delete {}", cmd.getRefName());

+					}

+					continue;

+				}

+

 				if (patchsetRefCmd != null) {

 					sendRejection(cmd, "You may only push one patchset at a time.");

 					continue;