diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2021-09-08 14:24:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 01:49:05 +0300 |
| commit | 516680ba7704c473bb21628aa19cabbd787df4db (patch) | |
| tree | d934e2d0337a272150524ae6b30e4bc6c27b72dc /builtin/revert.c | |
| parent | 5d9c9349bd0acda149f37eb1c5edc2a5ef747eea (diff) | |
sparse-index: integrate with cherry-pick and rebase
The hard work was already done with 'git merge' and the ORT strategy.
Just add extra tests to see that we get the expected results in the
non-conflict cases.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 237f2f18d4..6c4c22691b 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; |