format-patch: add "--rfc" for the common case of [RFC PATCH]
Add an alias for --subject-prefix='RFC PATCH', which is used commonly in some development communities to deserve such a short-hand. Signed-off-by: Josh Triplett <josh@joshtriplett.org> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
6ebdac1bab
commit
68e83a5b82
@ -1112,6 +1112,11 @@ static int subject_prefix_callback(const struct option *opt, const char *arg,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rfc_callback(const struct option *opt, const char *arg, int unset)
|
||||
{
|
||||
return subject_prefix_callback(opt, "RFC PATCH", unset);
|
||||
}
|
||||
|
||||
static int numbered_cmdline_opt = 0;
|
||||
|
||||
static int numbered_callback(const struct option *opt, const char *arg,
|
||||
@ -1419,6 +1424,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
|
||||
N_("start numbering patches at <n> instead of 1")),
|
||||
OPT_INTEGER('v', "reroll-count", &reroll_count,
|
||||
N_("mark the series as Nth re-roll")),
|
||||
{ OPTION_CALLBACK, 0, "rfc", &rev, NULL,
|
||||
N_("Use [RFC PATCH] instead of [PATCH]"),
|
||||
PARSE_OPT_NOARG | PARSE_OPT_NONEG, rfc_callback },
|
||||
{ OPTION_CALLBACK, 0, "subject-prefix", &rev, N_("prefix"),
|
||||
N_("Use [<prefix>] instead of [PATCH]"),
|
||||
PARSE_OPT_NONEG, subject_prefix_callback },
|
||||
@ -1557,7 +1565,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
|
||||
if (numbered && keep_subject)
|
||||
die (_("-n and -k are mutually exclusive."));
|
||||
if (keep_subject && subject_prefix)
|
||||
die (_("--subject-prefix and -k are mutually exclusive."));
|
||||
die (_("--subject-prefix/--rfc and -k are mutually exclusive."));
|
||||
rev.preserve_subject = keep_subject;
|
||||
|
||||
argc = setup_revisions(argc, argv, &rev, &s_r_opt);
|
||||
|
Reference in New Issue
Block a user