X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=a8354da815d338b035d995c4fc5b0e1ed45c001f;hp=1c4838550a006c6fcc57d7be3071b08cd5ea946a;hb=6bd227f5ac40d506bddd844555a6bc10300f2a7b;hpb=bcb9893f3163b29ef856fd4340e0a3ec13c20b9f

diff --git a/all b/all
index 1c483855..a8354da8 100755
--- a/all
+++ b/all
@@ -25,7 +25,6 @@ case "$0" in
 		case "`uname`" in
 			MINGW*|Win*)
 				# Windows hates users. So this script has to copy itself elsewhere first...
-				tname=
 				cp "$SELF" ../all.xonotic.sh
 				export WE_HATE_OUR_USERS=1
 				exec ../all.xonotic.sh "$@"
@@ -399,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