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

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 9e4dd0dc5043882a168f9cd3032e2dc948cfbf14..c912afa02533670096b8e41374c105e2bb3a738f 100755 (executable)
--- a/all
+++ b/all
@@ -275,6 +275,7 @@ fix_upstream_rebase()
        r_r=${r_r#refs/heads/}
        r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
        r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
+       r_bra=${r_bra#refs/heads/}
        if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
                if [ x"$r_other" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
                        return
@@ -395,7 +396,7 @@ bestmirror()
                if t=`mirrorspeed "$m"`; then
                        if [ -n "$t" ]; then
                                tt=$(($t$op)) # fudge factor
-                               msg "$m -> $t$op=$tt ticks"
+                               msg "$m -> $t$op = $tt ticks"
                                if [ -z "$bestt" ] || [ "$tt" -lt "$bestt" ]; then
                                        bestin=$in
                                        bestt=$tt
@@ -536,8 +537,23 @@ case "$cmd" in
                        fi
                        shift
                done
+               case "$location" in
+                       current)
+                               if [ x"`git config xonotic.all.mirrorselection 2>/dev/null || true`" != x"done" ]; then
+                                       git config xonotic.all.mirrorselection done
+                                       location=best
+                               fi
+                               ;;
+               esac
                case "$location" in
                        best)
+                               # if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing
+                               case "$base" in
+                                       ssh://*)
+                                               pushbase=$base
+                                               base=git://git.xonotic.org/xonotic/
+                                               ;;
+                               esac
                                newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
                                case "$newbase" in
                                        *\ *)