From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 14 Nov 2010 17:40:54 +0000 (+0100)
Subject: fix the use of git-checkout again
X-Git-Tag: xonotic-v0.1.0preview~51
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=b5257d38bcba38c17bf8022aa0d7c0221cd49ef4;hp=3738580fe1d9ce9cdfdba733d6a7b6cfcf3dfc03

fix the use of git-checkout again
---

diff --git a/all b/all
index 1a33e89e..a51cc9f6 100755
--- a/all
+++ b/all
@@ -1379,8 +1379,8 @@ case "$cmd" in
 						verbose git branch -D "${B#refs/heads/}"
 					fi
 				done
-				git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git checkout --track -b master origin/master || true
-				git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git checkout --track -b "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
+				git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch --track master origin/master || true
+				git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch --track "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
 			fi
 			checkself "$cmd" "$@"
 		done