Skip to content

Commit cff6cc2

Browse files
committed
fix: reset --hard even in the latest branch
currently latest branch gets out of date, and the correct history is lost (partial branches no longer seen in git log because commits differ, need to recover manually) need to test further tho because might result in unwanted behavior Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
1 parent 3c98710 commit cff6cc2

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

apply.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ const defaultApplyAction: ActionInsideEachCheckedOutBranch = async ({
3939

4040
console.log({ isFinalCheckout });
4141

42-
if (!isFinalCheckout) {
43-
await Git.Reset.reset(repo, commit, Git.Reset.TYPE.HARD, {});
42+
// if (!isFinalCheckout) {
43+
await Git.Reset.reset(repo, commit, Git.Reset.TYPE.HARD, {});
4444

45-
// if (previousTargetBranchName) {
46-
// execSyncInRepo(`/usr/bin/env git rebase ${previousTargetBranchName}`);
47-
// }
48-
}
45+
// if (previousTargetBranchName) {
46+
// execSyncInRepo(`/usr/bin/env git rebase ${previousTargetBranchName}`);
47+
// }
48+
// }
4949
};
5050

5151
export const getBackupPathOfPreviousStackedRebase = (pathToStackedRebaseDirInsideDotGit: string): string =>

0 commit comments

Comments
 (0)