Merge branch 'master' of ssh://git.xonotic.org/xonotic

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 1aaef60338a9e4f015df37b8fa726e73bb4b71ad..9d48c58ba6d5c38c948aeac26b577f08678146d9 100755 (executable)
--- a/all
+++ b/all
@@ -253,19 +253,25 @@ case "$cmd" in
                exists=false
                for d in $repos; do
                        enter "$d0/$d" verbose
                exists=false
                for d in $repos; do
                        enter "$d0/$d" verbose

-                       if [ -z "$branch" ]; then
-                               b=`repobranch "$d"`
-                       else
-                               b=$branch
-                       fi
-                       if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
+                       b=$branch
+                       if [ -n "$b" ] && git rev-parse "refs/heads/$b" >/dev/null 2>&1; then

                                exists=true
                                verbose git checkout "$b"
                                exists=true
                                verbose git checkout "$b"

-                       elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
+                       elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then

                                exists=true
                                verbose git checkout --track -b "$b" "$remote/$b"
                        else
                                exists=true
                                verbose git checkout --track -b "$b" "$remote/$b"
                        else

-                               verbose git checkout "`repobranch "$d"`"
+                               b=`repobranch "$d"`
+                               if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
+                                       exists=true
+                                       verbose git checkout "$b"
+                               elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
+                                       exists=true
+                                       verbose git checkout --track -b "$b" "$remote/$b"
+                               else
+                                       echo "WTF? Not even branch $b doesn't exist in $d"
+                                       exit 1
+                               fi

                        fi
                        cd "$d00"
                        checkself "$cmd" "$@"
                        fi
                        cd "$d00"
                        checkself "$cmd" "$@"