also a test compile step now :P

[xonotic/xonotic.git] / all

diff --git a/all b/all
index a5e00520bb069eec4cc152ed89745cf0ce98e947..f7a74e76c6a210974bdec6965b09d3be4205cd39 100755 (executable)
--- 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
                ;;