| commit | 796abac7e11ffb0ac140e93f4649bb0264f35025 | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 25 Jan 2023 04:03:50 +0000 (25 04:03 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jan 2023 17:20:53 +0000 (25 09:20 -0800) | ||
| tree | 42d44da2f355dd4c6d94420673a5eb6ab59bf59f | treesnapshot (tar.gz zip) |
| parent | ffeaca177ac789942b1db95c334d0eff9c8f12a5 | commitdiff |
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>
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>
| builtin/rebase.c | diffblobblamehistory | |
| t/t3422-rebase-incompatible-options.sh | diffblobblamehistory |