diff options
| author | Elijah Newren <newren@gmail.com> | 2023-01-25 04:03:50 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-25 09:20:53 -0800 |
| commit | 796abac7e11ffb0ac140e93f4649bb0264f35025 (patch) | |
| tree | 42d44da2f355dd4c6d94420673a5eb6ab59bf59f /builtin/commit.c | |
| parent | rebase: fix incompatiblity checks for --[no-]reapply-cherry-picks (diff) | |
| download | git-796abac7e11ffb0ac140e93f4649bb0264f35025.tar.gz git-796abac7e11ffb0ac140e93f4649bb0264f35025.zip | |
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/commit.c')
0 files changed, 0 insertions, 0 deletions