From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 9 Jul 2010 21:08:38 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/merlijn/sdl-osx'
X-Git-Tag: xonotic-v0.1.0preview~374
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f217d0db491385cbf8e5e0ee2446d8222f0d5883;hp=bfe3e801b04693bbe695332e38a23afc543be844

Merge remote branch 'refs/remotes/origin/merlijn/sdl-osx'
---

diff --git a/all b/all
index 2489f5aa..bb0fa483 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