From 30ec2898f52b8be0389ae94bcf04838813017c41 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divVerent@xonotic.org>
Date: Tue, 23 Nov 2010 10:24:23 +0100
Subject: [PATCH] fix another bug in the script ;)

---
 all | 1 +
 1 file changed, 1 insertion(+)

diff --git a/all b/all
index 1b29784..c912afa 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