| commit | cadcf58085cada6e781444cbdde6d4b0067ebe4c | |
| author | Dragan Simic <dsimic@manjaro.org> | |
| Fri, 19 Apr 2024 01:05:30 +0000 (19 03:05 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Apr 2024 15:40:57 +0000 (19 08:40 -0700) | ||
| tree | 4cec1db57497488986455538a2e4dcf376e24112 | treesnapshot (tar.gz zip) |
| parent | e0d7db7423a91673c001aaa5e580c815ce2f7f92 | commitdiff |
format-patch: ensure that --rfc and -k are mutually exclusive
Fix a bug that allows the "--rfc" and "-k" options to be specified together
when "git format-patch" is executed, which was introduced in the commit
e0d7db7423a9 ("format-patch: --rfc honors what --subject-prefix sets").
Add a couple of additional tests to t4014, to cover additional cases of
the mutual exclusivity between different "git format-patch" options.
Signed-off-by: Dragan Simic <dsimic@manjaro.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Fix a bug that allows the "--rfc" and "-k" options to be specified together
when "git format-patch" is executed, which was introduced in the commit
e0d7db7423a9 ("format-patch: --rfc honors what --subject-prefix sets").
Add a couple of additional tests to t4014, to cover additional cases of
the mutual exclusivity between different "git format-patch" options.
Signed-off-by: Dragan Simic <dsimic@manjaro.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/log.c | diffblobblamehistory | |
| t/t4014-format-patch.sh | diffblobblamehistory |