add another uname prefix to detect Windows (seen that somewhere)

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 72601766d029ec3c37dd8126ec4300721ec6a2a6..1cd8124a1e65ac89032995edf89dfdb3e44ebbb6 100755 (executable)
--- a/all
+++ b/all
@@ -18,7 +18,7 @@ SELF="$d0/all"
 case "$0" in
        all|*/all)
                case "`uname`" in
-                       MINGW*)
+                       MINGW*|Win*)
                                # Windows hates users. So this script has to copy itself elsewhere first...
                                tname=
                                cp "$SELF" ../all.xonotic.sh
@@ -153,10 +153,17 @@ case "$cmd" in
                                                fi
                                                ;;
                                esac
-                               if ! verbose git pull; then
-                                       check_mergeconflict "$d"
-                                       # do not exit, as this may also mean we are tracking something else
+                               verbose git config remote.origin.fetch "refs/heads/*:refs/remotes/origin/*"
+
+                               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
+                                       fi
                                fi
+
                                cd "$d00"
                                checkself "$cmd" "$@"
                                cd "$d0/$d"
@@ -198,10 +205,14 @@ case "$cmd" in
        branch)
                remote=$1
                branch=$2
+               srcbranch=$3
                if [ -z "$branch" ]; then
                        branch=$remote
                        remote=origin
                fi
+               if [ -z "$srcbranch" ]; then
+                       srcbranch=master
+               fi
                if [ -z "$branch" ]; then
                        for d in $repos; do
                                enter "$d0/$d"
@@ -220,7 +231,7 @@ case "$cmd" in
                                        read -r a
                                done
                                if [ x"$a" = x"y" ]; then
-                                       verbose git push "$remote" HEAD:"$branch"
+                                       verbose git push "$remote" "$srcbranch":"$branch"
                                        verbose git checkout --track -b "$branch" "$remote/$branch"
                                fi
                                cd "$d0"
@@ -344,6 +355,7 @@ case "$cmd" in
                echo "  $SELF push"
                echo "  $SELF branches"
                echo "  $SELF branch [<remote>] <branchname>"
+               echo "  $SELF branch <remote> <branchname> <srcbranchname>"
                echo "  $SELF checkout [<remote>] <branchname>"
                echo "  $SELF compile"
                echo "  $SELF run <client> <options>"