From 97b91c77f85232a85eaa97d0ff6ef817172feb9f Mon Sep 17 00:00:00 2001 From: Kipras Melnikovas Date: Tue, 25 Jan 2022 04:35:06 +0200 Subject: [PATCH] fix: always `markThatNeedsToApply`, until proven otherwise (TBD) Signed-off-by: Kipras Melnikovas --- git-stacked-rebase.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/git-stacked-rebase.ts b/git-stacked-rebase.ts index 224fe642..4b65e2b5 100755 --- a/git-stacked-rebase.ts +++ b/git-stacked-rebase.ts @@ -701,6 +701,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}" ); console.log("big buns - the proper rebase returned"); + /** + * will need to apply, unless proven otherwise + */ + markThatNeedsToApply(); + /** * part 2 of "the different ways to launch git rebase" */ @@ -775,8 +780,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}" }); console.log(""); - if (rebaseChangedLocalHistory) { - markThatNeedsToApply(); + if (!rebaseChangedLocalHistory) { + /** + * TODO `unmarkThatNeedsToApply` (NOT the same as `markThatApplied`!) + */ + // unmarkThatNeedsToApply(); } /**