From 9eccd9ad1e6e7330b57a82f78fddfe8bb8f18566 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 7 Dec 2024 18:47:55 -0800 Subject: [PATCH] op: also fix resetting --- tools/op.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/op.sh b/tools/op.sh index 849fd0bff6..0166b0d854 100755 --- a/tools/op.sh +++ b/tools/op.sh @@ -329,7 +329,7 @@ function op_switch() { git fetch "$REMOTE" "$BRANCH" git checkout -f --recurse-submodules "$BRANCH" - git reset --hard "$BRANCH" + git reset --hard "${REMOTE}/${BRANCH}" git clean -df git submodule update --init --recursive git submodule foreach git reset --hard