diff options
| author | Elijah Newren <newren@gmail.com> | 2023-01-25 07:03:50 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-25 20:20:53 +0300 |
| commit | 796abac7e11ffb0ac140e93f4649bb0264f35025 (patch) | |
| tree | 42d44da2f355dd4c6d94420673a5eb6ab59bf59f /builtin | |
| parent | ffeaca177ac789942b1db95c334d0eff9c8f12a5 (diff) | |
rebase: add coverage of other incompatible options
The git-rebase manual noted several sets of incompatible options, but
we were missing tests for a few of these. Further, we were missing
code checks for one of these, which could result in command line
options being silently ignored.
Also, note that adding a check for autosquash means that using
--whitespace=fix together with the config setting rebase.autosquash=true
will trigger an error. A subsequent commit will improve the error
message.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 05b130bfae..d6b20a6a53 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1511,6 +1511,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (options.update_refs) imply_merge(&options, "--update-refs"); + if (options.autosquash) + imply_merge(&options, "--autosquash"); + if (options.type == REBASE_UNSPECIFIED) { if (!strcmp(options.default_backend, "merge")) imply_merge(&options, "--merge"); |