X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=c912afa02533670096b8e41374c105e2bb3a738f;hp=e4b60dfb95db67cf422e5f35889e4fd973d0d8f1;hb=30ec2898f52b8be0389ae94bcf04838813017c41;hpb=f56e3c1da289fff5ef2bef7f148d05b80b2be8e0

diff --git a/all b/all
index e4b60dfb..c912afa0 100755
--- 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
@@ -550,7 +551,7 @@ case "$cmd" in
 				case "$base" in
 					ssh://*)
 						pushbase=$base
-						base=git://git.xonotic.org/xonotic/xonotic.git
+						base=git://git.xonotic.org/xonotic/
 						;;
 				esac
 				newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`