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

diff --combined all
index bffab80cc57b73330513d68d8c2af797a9e61e02,593736e7e2a392d81acbe5b5e738a58c920a04a7..6166c77cf1d9461bce81868b9eebdf94b89f252b
--- 1/all
--- 2/all
+++ b/all
@@@ -119,16 -119,6 +119,16 @@@ repos_urls=
        netradiant
  "
  
 +repos_urls=`
 +      for X in $repos_urls; do 
 +              d="${X%%@*}"
 +              p="${d%dir}"
 +              if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
 +                      echo "$X"
 +              fi
 +      done
 +`
 +
  repos=`for X in $repos_urls; do echo "${X%%@*}"; done`
  
  if [ "$#" = 0 ]; then
@@@ -243,13 -233,17 +243,17 @@@ case "$cmd" i
                                dv=`visible_repo_name "$d"`
                                enter "$d0/$d" verbose
                                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