Skip to content

Commit db90b05

Browse files
committed
use adaptive branch boundary finder behavior as the default in branchSequencer
realised that `--branch-sequencer --exec` should be adaptive as well, just like forcePush, because it can be ran anytime -- both if stacked rebase is not in progress (needs an apply), and when it's done. another option would be to allow the user to specify the wanted behavior, so that it'd be explicit & we'd fail if the expectations aren't met, but i haven't seen a use-case for this yet, and either way, the current solution should be good in any case, while the 'expectations' idea can be added later if needed. Signed-off-by: Kipras Melnikovas <[email protected]>
1 parent 87d94f1 commit db90b05

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

branchSequencer.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,10 @@ export enum BehaviorOfGetBranchBoundaries {
157157
*/
158158
"if-stacked-rebase-in-progress-then-parse-not-applied-state-otherwise-simple-branch-traverse",
159159
}
160-
export const defaultGetBranchBoundariesBehavior = BehaviorOfGetBranchBoundaries["parse-from-not-yet-applied-state"];
160+
export const defaultGetBranchBoundariesBehavior =
161+
BehaviorOfGetBranchBoundaries[
162+
"if-stacked-rebase-in-progress-then-parse-not-applied-state-otherwise-simple-branch-traverse"
163+
];
161164

162165
const pickBoundaryParser = ({
163166
behaviorOfGetBranchBoundaries,

0 commit comments

Comments
 (0)