diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-20 22:20:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 22:20:45 (GMT) |
| commit | a16dd1374023d1a5f6ee7c48661e0ed53a954391 (patch) | |
| tree | 73d6f7e3c1f5ae4ad74cfc76b88002625f948c3f /builtin/merge.c | |
| parent | dc89c34d9e9237293d0ed73adc454fedfc620f74 (diff) | |
| parent | 516680ba7704c473bb21628aa19cabbd787df4db (diff) | |
| download | git-a16dd1374023d1a5f6ee7c48661e0ed53a954391.zip git-a16dd1374023d1a5f6ee7c48661e0ed53a954391.tar.gz git-a16dd1374023d1a5f6ee7c48661e0ed53a954391.tar.bz2 | |
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 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index d2c52b6..f6d03dd 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1276,6 +1276,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix) if (argc == 2 && !strcmp(argv[1], "-h")) usage_with_options(builtin_merge_usage, builtin_merge_options); + prepare_repo_settings(the_repository); + the_repository->settings.command_requires_full_index = 0; + /* * Check if we are _not_ on a detached HEAD, i.e. if there is a * current branch. |