fix the use of git-checkout again
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 17:40:54 +0000 (18:40 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 17:40:54 +0000 (18:40 +0100)
all

diff --git a/all b/all
index 1a33e89ed503e5f3ea479a590bcfc86af3fa4f1c..a51cc9f64547bfa4d7a527fbbb68bc67144a9974 100755 (executable)
--- 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