diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:45 -0700 |
| commit | a16dd1374023d1a5f6ee7c48661e0ed53a954391 (patch) | |
| tree | 73d6f7e3c1f5ae4ad74cfc76b88002625f948c3f /builtin/revert.c | |
| parent | Merge branch 'ds/sparse-index-ignored-files' (diff) | |
| parent | sparse-index: integrate with cherry-pick and rebase (diff) | |
| download | tgif-a16dd1374023d1a5f6ee7c48661e0ed53a954391.tar.xz | |
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/revert.c')
| -rw-r--r-- | builtin/revert.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 2e13660e4b..51776abea6 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -136,6 +136,9 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts) PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN); + prepare_repo_settings(the_repository); + the_repository->settings.command_requires_full_index = 0; + /* implies allow_empty */ if (opts->keep_redundant_commits) opts->allow_empty = 1; |