From 6832c25d27ba610f13579d4b7384c325aca76990 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 14 Aug 2010 02:46:07 +0200 Subject: [PATCH] checkout -f --- all | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/all b/all index ed7e1b07..6fabbd47 100755 --- a/all +++ b/all @@ -285,6 +285,11 @@ case "$cmd" in misc/tools/xonotic-map-compiler-autobuild download ;; checkout|switch) + checkoutflags= + if [ x"$1" = x"-f" ]; then + checkoutflags=-f + shift + fi remote=$1 branch=$2 if [ -z "$branch" ]; then @@ -305,18 +310,18 @@ case "$cmd" in b=$branch if [ -n "$b" ] && git rev-parse "refs/heads/$b" >/dev/null 2>&1; then exists=true - verbose git checkout "$b" + verbose git checkout $checkoutflags "$b" elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then exists=true - verbose git checkout --track -b "$b" "$remote/$b" + verbose git checkout $checkoutflags --track -b "$b" "$remote/$b" else b=`repobranch "$d"` if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then exists=true - verbose git checkout "$b" + verbose git checkout $checkoutflags "$b" elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then exists=true - verbose git checkout --track -b "$b" "$remote/$b" + verbose git checkout $checkoutflags --track -b "$b" "$remote/$b" else echo "WTF? Not even branch $b doesn't exist in $d" exit 1 -- 2.39.2