From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 28 Dec 2010 14:58:21 +0000 (+0100)
Subject: admin-merge -d
X-Git-Tag: xonotic-v0.5.0~142
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c37933230b9cabe45fd6106f1ba089fce736695f;p=xonotic%2Fxonotic.git

admin-merge -d
---

diff --git a/all b/all
index 5a499dd3..5b886a4d 100755
--- a/all
+++ b/all
@@ -1156,6 +1156,13 @@ case "$cmd" in
 		;;
 	admin-merge)
 		branch=$1
+		only_delete=false
+		case "$branch" in
+			-d)
+				branch=
+				only_delete=true
+				;;
+		esac
 		t=`mktemp`
 		report=""
 		reportecho()
@@ -1233,6 +1240,8 @@ case "$cmd" in
 							git push origin :"${ref#refs/remotes/origin/}"
 							reportecho4 "--> branch deleted"
 						fi
+					elif $only_delete; then
+						reportecho4 "--> skipped in delete-only run"
 					elif [ -z "$branch" ] && [ -n "$note" ]; then
 						reportdo4 $ECHO "$note"
 						reportecho4 "--> not merging, already had this one rejected before"