From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 22 Apr 2010 13:56:16 +0000 (+0200)
Subject: ./all: new admin-merge command to review and merge a branch
X-Git-Tag: xonotic-v0.1.0preview~489
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=43ddbc8816eaccfed16d0205d4ebd06e3e9508e7;hp=5f46e908547dffbaba1661966633ec2eea4c6940

./all: new admin-merge command to review and merge a branch
---

diff --git a/all b/all
index 1d85b6e2..7b882074 100755
--- a/all
+++ b/all
@@ -444,6 +444,27 @@ case "$cmd" in
 		done
 		rm -rf "$patchdir"
 		;;
+	admin-merge)
+		for d in $repos; do
+			enter "$d0/$d" verbose
+			git rev-parse "$1/$2" || continue
+			# 1. review
+			{
+				git log HEAD.."$1/$2"
+				git diff HEAD..."$1/$2"
+			} | less
+			a=
+			while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+				echo "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"
+				read -r a
+			done
+			if [ x"$a" = x"y" ]; then
+				git merge "$1/$2"
+				git push origin HEAD
+				git push "$1" :"$2"
+			fi
+		done
+		;;
 	*)
 		echo "Usage:"
 		echo "  $SELF pull"