blind_id: new lib for win32

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 051a5e8e5ace91e81422c302d0c33fdcf54910a5..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
@@ -546,6 +547,13 @@ case "$cmd" in
                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
                                        *\ *)