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

diff --cc all
index 11bf13e2e19158974d0fb07441f99b641a7d1f1f,e19793567a34d224808a78fc4e1832b49a508248..593736e7e2a392d81acbe5b5e738a58c920a04a7
--- 1/all
--- 2/all
+++ b/all
@@@ -224,19 -231,15 +231,19 @@@ case "$cmd" i
                else
                        for d in $repos; do
                                dv=`visible_repo_name "$d"`
-                               enter "$d0/$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