reset

winglang · Aug 29, 2023 · 25a2eda · 25a2eda
1 parent 7c0bdd6
commit 25a2eda
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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}`);
     }
   }