fix: always markThatNeedsToApply, until proven otherwise (TBD)

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
kiprasmel · May 8, 2022 · 154a758 · 154a758
1 parent 0291ab1
commit 154a758
Showing 1 changed file with 10 additions and 2 deletions.
diff --git 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();
 		}
 
 		/**