X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=all;h=556a0e878d9617eae206844bc50777f3eee1ce43;hb=dad2c9c15afc336a84fc9d4f4d2705cc8e3aba09;hp=23acd27e6276aea3569f3065994638f930bb2a38;hpb=7f21fe50c709a04174badcfa5b4115bc387849ac;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index 23acd27e..556a0e87 100755
--- a/all
+++ b/all
@@ -272,6 +272,7 @@ fix_upstream_rebase()
 
 	# one of the two sides of the merge should be remote upstream, or all is fine
 	r_r=`git symbolic-ref HEAD`
+	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"`
 	if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then