diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-30 14:49:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-30 14:49:42 -0700 |
| commit | 07fc8275e1b41c8e256edb0e42483d317adfdb91 (patch) | |
| tree | 6277637c2494f318c008c6c0aa82b547d36631e1 /builtin/log.c | |
| parent | 55e5548a0f62b2b9a4e22d585320d23c06eeee65 (diff) | |
| parent | cadcf58085cada6e781444cbdde6d4b0067ebe4c (diff) | |
| download | git-07fc8275e1b41c8e256edb0e42483d317adfdb91.tar.gz | |
Merge branch 'ds/format-patch-rfc-and-k'
The "-k" and "--rfc" options of "format-patch" will now error out
when used together, as one tells us not to add anything to the
title of the commit, and the other one tells us to add "RFC" in
addition to "PATCH".
* ds/format-patch-rfc-and-k:
format-patch: ensure that --rfc and -k are mutually exclusive
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index c0a8bb95e9..8bab30fcc7 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -2050,8 +2050,10 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (cover_from_description_arg) cover_from_description_mode = parse_cover_from_description(cover_from_description_arg); - if (rfc) + if (rfc) { strbuf_insertstr(&sprefix, 0, "RFC "); + subject_prefix = 1; + } if (reroll_count) { strbuf_addf(&sprefix, " v%s", reroll_count); |