./all: allow the branch command even if the branch already exists, skip the repos...

[xonotic/xonotic.git] / all

diff --git a/all b/all
index f36fdde2eeeceae5f4f5137e37e4b1001f72e655..11bf13e2e19158974d0fb07441f99b641a7d1f1f 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
@@ -226,13 +226,17 @@ case "$cmd" in
                                dv=`visible_repo_name "$d"`
                                enter "$d0/$d"
                                a=
-                               while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
-                                       echo "Branch in $dv?"
-                                       read -r a
-                               done
-                               if [ x"$a" = x"y" ]; then
-                                       verbose git push "$remote" "$srcbranch":"$branch"
-                                       verbose git checkout --track -b "$branch" "$remote/$branch"
+                               if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
+                                       echo "Already having this branch in $dv."
+                               else
+                                       while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+                                               echo "Branch in $dv?"
+                                               read -r a
+                                       done
+                                       if [ x"$a" = x"y" ]; then
+                                               verbose git push "$remote" "$srcbranch":"$branch"
+                                               verbose git checkout --track -b "$branch" "$remote/$branch"
+                                       fi
                                fi
                                cd "$d0"
                        done
@@ -270,7 +274,7 @@ case "$cmd" in
                        cd "$d0"
                done
                ;;
-       push)
+       push|commit)
                for d in $repos; do
                        dv=`visible_repo_name "$d"`
                        enter "$d0/$d"