From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 22 Apr 2010 18:40:40 +0000 (+0200)
Subject: also a test compile step now :P
X-Git-Tag: xonotic-v0.1.0preview~487
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=d66829412424e2a2448e007ac872f42299e93d3c

also a test compile step now :P
---

diff --git a/all b/all
index a5e00520..f7a74e76 100755
--- a/all
+++ b/all
@@ -461,10 +461,21 @@ case "$cmd" in
 			if [ x"$a" = x"y" ]; then
 				git merge "$1/$2"
 				cd "$d0"
-				"$SELF" compile
+				a=
+				if ! "$SELF" compile; then
+					a=n
+				fi
 				cd "$d0/d"
-				git push origin HEAD
-				git push "$1" :"$2"
+				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+					echo "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."
+					read -r a
+				done
+				if [ x"$a" = x"y" ]; then
+					git push origin HEAD
+					git push "$1" :"$2"
+				else
+					git reset --hard HEAD@{1}
+				fi
 			fi
 		done
 		;;