From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 21 Nov 2010 15:16:19 +0000 (+0100)
Subject: fix last fix
X-Git-Tag: xonotic-v0.1.0preview~36^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dad2c9c15afc336a84fc9d4f4d2705cc8e3aba09;p=xonotic%2Fxonotic.git

fix last fix
---

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