Skip to content

Commit 3438ed8

Browse files
committed
fixup! sequencer: ensure full index if not ORT strategy
1 parent a36b4ec commit 3438ed8

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

sequencer.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,7 @@ static int do_recursive_merge(struct repository *r,
652652
merge_switch_to_result(&o, head_tree, &result, 1, show_output);
653653
clean = result.clean;
654654
} else {
655+
ensure_full_index(r->index);
655656
clean = merge_trees(&o, head_tree, next_tree, base_tree);
656657
if (is_rebase_i(opts) && clean <= 0)
657658
fputs(o.obuf.buf, stdout);

0 commit comments

Comments
 (0)