From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 9 Jul 2010 20:54:58 +0000 (+0200)
Subject: properly identify upstream
X-Git-Tag: xonotic-v0.1.0preview~375
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=6bd227f5ac40d506bddd844555a6bc10300f2a7b

properly identify upstream
---

diff --git a/all b/all
index 9480f29f..a8354da8 100755
--- a/all
+++ b/all
@@ -398,7 +398,7 @@ case "$cmd" in
 			fi
 			rem=`git config "branch.$r.remote" || echo origin`
 			bra=`git config "branch.$r.merge" || echo "$r"`
-			upstream="$rem/$bra"
+			upstream="$rem/${bra#refs/heads/}"
 			if ! git rev-parse "$upstream" >/dev/null 2>&1; then
 				upstream="origin/`repobranch "$d"`"
 			fi