Skip to content

Commit 53b776f

Browse files
committed
fix: always markThatNeedsToApply, until proven otherwise (TBD)
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
1 parent 201caa4 commit 53b776f

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
@@ -701,6 +701,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}"
701701
);
702702
console.log("big buns - the proper rebase returned");
703703

704+
/**
705+
* will need to apply, unless proven otherwise
706+
*/
707+
markThatNeedsToApply();
708+
704709
/**
705710
* part 2 of "the different ways to launch git rebase"
706711
*/
@@ -775,8 +780,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}"
775780
});
776781
console.log("");
777782

778-
if (rebaseChangedLocalHistory) {
779-
markThatNeedsToApply();
783+
if (!rebaseChangedLocalHistory) {
784+
/**
785+
* TODO `unmarkThatNeedsToApply` (NOT the same as `markThatApplied`!)
786+
*/
787+
// unmarkThatNeedsToApply();
780788
}
781789

782790
/**

0 commit comments

Comments
 (0)