don't abort completely if git pull gitake'd

[xonotic/xonotic.git] / all

diff --git a/all b/all
index a5e00520bb069eec4cc152ed89745cf0ce98e947..e19793567a34d224808a78fc4e1832b49a508248 100755 (executable)
--- a/all
+++ b/all
@@ -23,6 +23,7 @@ case "$0" in
                                # Windows hates users. So this script has to copy itself elsewhere first...
                                tname=
                                cp "$SELF" ../all.xonotic.sh
+                               export WE_HATE_OUR_USERS=1
                                exec ../all.xonotic.sh "$@"
                                ;;
                esac
@@ -157,15 +158,16 @@ case "$cmd" in
                                verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
                                        # TODO remove this line later
 
-                               verbose git config core.autocrlf input
-                               verbose git config core.safecrlf true
+                               verbose git config core.autocrlf false
+                               verbose git config core.safecrlf false # we don't NEED that...
 
                                r=`git symbolic-ref HEAD`
                                r=${r#refs/heads/}
                                if git config branch.$r.remote >/dev/null 2>&1; then
                                        if ! verbose git pull; then
                                                check_mergeconflict "$d"
-                                               exit 1 # FATAL
+                                               echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
+                                               read -r DUMMY
                                        fi
                                fi
 
@@ -351,10 +353,16 @@ case "$cmd" in
                enter "$d0/darkplaces" verbose
                verbose make $MAKEFLAGS sv-debug
                verbose make $MAKEFLAGS cl-debug
-               verbose make $MAKEFLAGS sdl-debug
+               if ! [ -n "$WE_HATE_OUR_USERS" ]; then
+                       verbose make $MAKEFLAGS sdl-debug
+               fi
                ;;
        run)
-               client=-sdl
+               if [ -n "$WE_HATE_OUR_USERS" ]; then
+                       client=
+               else
+                       client=-sdl
+               fi
                case "$1" in
                        sdl|glx|agl|dedicated)
                                client=-$1
@@ -461,10 +469,21 @@ case "$cmd" in
                        if [ x"$a" = x"y" ]; then
                                git merge "$1/$2"
                                cd "$d0"
-                               "$SELF" compile
-                               cd "$d0/d"
-                               git push origin HEAD
-                               git push "$1" :"$2"
+                               a=
+                               if ! "$SELF" compile; then
+                                       a=n
+                               fi
+                               cd "$d0/$d"
+                               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
                ;;