diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-21 01:20:44 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-21 01:20:45 +0300 |
| commit | a16dd1374023d1a5f6ee7c48661e0ed53a954391 (patch) | |
| tree | 73d6f7e3c1f5ae4ad74cfc76b88002625f948c3f /merge-recursive.c | |
| parent | dc89c34d9e9237293d0ed73adc454fedfc620f74 (diff) | |
| parent | 516680ba7704c473bb21628aa19cabbd787df4db (diff) | |
Merge branch 'ds/mergies-with-sparse-index'
Various mergy operations have been prepared to work efficiently
with the sparse index.
* ds/mergies-with-sparse-index:
sparse-index: integrate with cherry-pick and rebase
sequencer: ensure full index if not ORT strategy
t1092: add cherry-pick, rebase tests
merge-ort: expand only for out-of-cone conflicts
merge: make sparse-aware with ORT
diff: ignore sparse paths in diffstat
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 840599fd53..e594d4c3fa 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3747,6 +3747,9 @@ int merge_recursive(struct merge_options *opt, assert(opt->ancestor == NULL || !strcmp(opt->ancestor, "constructed merge base")); + prepare_repo_settings(opt->repo); + opt->repo->settings.command_requires_full_index = 1; + if (merge_start(opt, repo_get_commit_tree(opt->repo, h1))) return -1; clean = merge_recursive_internal(opt, h1, h2, merge_bases, result); |