op/switch: more robust switching

4 months ago · df2bf83846
parent d735db6113
commit df2bf83846
1 changed files with 2 additions and 1 deletions
--- a/tools/op.sh
+++ b/tools/op.sh
@ -328,7 +328,8 @@ function op_switch() {
  BRANCH="$1"

  git fetch "$REMOTE" "$BRANCH"
-  git checkout -f --recurse-submodules --track "$REMOTE"/"$BRANCH"
+  git checkout -f FETCH_HEAD
+  git checkout -B "$BRANCH" --track "$REMOTE"/"$BRANCH"
  git reset --hard "${REMOTE}/${BRANCH}"
  git clean -df
  git submodule update --init --recursive