From 25a2edaec6db94dc73f2359c762c30995f003944 Mon Sep 17 00:00:00 2001
From: Mark McCulloh <Mark.McCulloh@gmail.com>
Date: Tue, 29 Aug 2023 14:30:29 -0400
Subject: [PATCH] reset

---
 tools/bump-pack/src/derive-shas.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/bump-pack/src/derive-shas.ts b/tools/bump-pack/src/derive-shas.ts
index 04abede120d..0bda7ad37e7 100644
--- a/tools/bump-pack/src/derive-shas.ts
+++ b/tools/bump-pack/src/derive-shas.ts
@@ -71,6 +71,7 @@ async function findSuccessfulCommit(branchName: string) {
     try {
       // create a new branch locally to rebase onto main
       const tmpBranchName = `tmp-pr-diff-${HEAD_SHA}`;
+
       try {
         betterExec(`git branch -D --force ${tmpBranchName}`);
       } catch {}
@@ -99,7 +100,8 @@ async function findSuccessfulCommit(branchName: string) {
         betterExec(`git rebase --quit`);
       } catch {}
 
-      betterExec(`git switch ${originalHEAD_SHA}`);
+      // regardless of whether we succeeded or not, switch back to the original commit
+      betterExec(`git reset --hard ${originalHEAD_SHA}`);
     }
   }