Skip to content

Commit 6dd3c25

Browse files
committed
fix: always markThatNeedsToApply, until proven otherwise (TBD)
Signed-off-by: Kipras Melnikovas <[email protected]>
1 parent 54171c6 commit 6dd3c25

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

git-stacked-rebase.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}"
698698
);
699699
console.log("big buns - the proper rebase returned");
700700

701+
/**
702+
* will need to apply, unless proven otherwise
703+
*/
704+
markThatNeedsToApply();
705+
701706
/**
702707
* part 2 of "the different ways to launch git rebase"
703708
*/
@@ -770,8 +775,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}"
770775
});
771776
console.log("");
772777

773-
if (rebaseChangedLocalHistory) {
774-
markThatNeedsToApply();
778+
if (!rebaseChangedLocalHistory) {
779+
/**
780+
* TODO `unmarkThatNeedsToApply` (NOT the same as `markThatApplied`!)
781+
*/
782+
// unmarkThatNeedsToApply();
775783
}
776784

777785
/**

0 commit comments

Comments
 (0)