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

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 2489f5aa991a9e202816c0053b4bff0fc656bd3c..bb0fa4833923a3cd08bd995cde7e5a42e2169db4 100755 (executable)
--- 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