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/rebase.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/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index eb01f4d790..0150893a3b 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -560,6 +560,9 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0); + prepare_repo_settings(the_repository); + the_repository->settings.command_requires_full_index = 0; + if (!is_null_oid(&squash_onto)) opts.squash_onto = &squash_onto; @@ -1431,6 +1434,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) usage_with_options(builtin_rebase_usage, builtin_rebase_options); + prepare_repo_settings(the_repository); + the_repository->settings.command_requires_full_index = 0; + options.allow_empty_message = 1; git_config(rebase_config, &options); /* options.gpg_sign_opt will be either "-S" or NULL */ |