@@ -11,7 +11,7 @@ import { bullets } from "nice-comment";
1111
1212import { filenames } from "./filenames" ;
1313import { configKeys } from "./configKeys" ;
14- import { apply , applyIfNeedsToApply } from "./apply" ;
14+ import { apply , applyIfNeedsToApply , markThatNeedsToApply as _markThatNeedsToApply } from "./apply" ;
1515import { forcePush } from "./forcePush" ;
1616import { branchSequencer } from "./branchSequencer" ;
1717
@@ -284,6 +284,10 @@ export const gitStackedRebase = async (
284284 const pathToStackedRebaseDirInsideDotGit : string = parsed . pathToStackedRebaseDirInsideDotGit ;
285285 const pathToStackedRebaseTodoFile : string = parsed . pathToStackedRebaseTodoFile ;
286286
287+ if ( fs . existsSync ( path . join ( pathToStackedRebaseDirInsideDotGit , filenames . willNeedToApply ) ) ) {
288+ _markThatNeedsToApply ( pathToStackedRebaseDirInsideDotGit ) ;
289+ }
290+
287291 if ( options . apply ) {
288292 return await apply ( {
289293 repo,
@@ -701,7 +705,7 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}"
701705 /**
702706 * will need to apply, unless proven otherwise
703707 */
704- markThatNeedsToApply ( ) ;
708+ fs . writeFileSync ( path . join ( pathToStackedRebaseDirInsideDotGit , filenames . willNeedToApply ) , "" ) ;
705709
706710 /**
707711 * part 2 of "the different ways to launch git rebase"
@@ -775,11 +779,14 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}"
775779 } ) ;
776780 console . log ( "" ) ;
777781
778- if ( ! rebaseChangedLocalHistory ) {
779- /**
780- * TODO `unmarkThatNeedsToApply` (NOT the same as `markThatApplied`!)
781- */
782- // unmarkThatNeedsToApply();
782+ fs . unlinkSync ( path . join ( pathToStackedRebaseDirInsideDotGit , filenames . willNeedToApply ) ) ;
783+ if ( rebaseChangedLocalHistory ) {
784+ markThatNeedsToApply ( ) ;
785+ } else {
786+ // /**
787+ // * TODO `unmarkThatNeedsToApply` (NOT the same as `markThatApplied`!)
788+ // */
789+ // // unmarkThatNeedsToApply();
783790 }
784791
785792 /**
0 commit comments