Has the same functionality as the '--cc' option and 'format.cc' configuration variable but for the "To:" email header. Half of the code to support this was already there.
With email the To: header usually more important than the Cc: header.
Signed-off-by: Steven Drake <sdrake@xnet.co.nz> --- Documentation/git-format-patch.txt | 11 ++++++++--- builtin-log.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-)
Show changes to 2 files +24 −3
Documentation/git-format-patch.txt, builtin-log.c
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index f1fd0df..e936d71 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -18,7 +18,7 @@ SYNOPSIS [--in-reply-to=Message-Id] [--suffix=.<sfx>] [--ignore-if-in-upstream] [--subject-prefix=Subject-Prefix] - [--cc=<email>] + [--to=<email>] [--cc=<email>] [--cover-letter] [<common diff options>] [ <since> | <revision range> ] @@ -162,6 +162,10 @@ will want to ensure that threading is disabled for `git send-email`. allows for useful naming of a patch series, and can be combined with the `--numbered` option. +--to=<email>:: + Add a `To:` header to the email headers. This is in addition + to any configured headers, and may be used multiple times. + --cc=<email>:: Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. @@ -202,8 +206,8 @@ CONFIGURATION ------------- You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when -outputting more than one patch, add "Cc:" headers, configure attachments, -and sign off patches with configuration variables. +outputting more than one patch, add "To" or "Cc:" headers, configure +attachments, and sign off patches with configuration variables. ------------ [format] @@ -211,6 +215,7 @@ and sign off patches with configuration variables. subjectprefix = CHANGE suffix = .txt numbered = auto + to = <email> cc = <email> attach [ = mime-boundary-string ] signoff = true diff --git a/builtin-log.c b/builtin-log.c index 41b6df4..89f8d60 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -501,6 +501,13 @@ static int git_format_config(const char *var, const char *value, void *cb) } if (!strcmp(var, "format.suffix")) return git_config_string(&fmt_patch_suffix, var, value); + if (!strcmp(var, "format.to")) { + if (!value) + return config_error_nonbool(var); + ALLOC_GROW(extra_to, extra_to_nr + 1, extra_to_alloc); + extra_to[extra_to_nr++] = xstrdup(value); + return 0; + } if (!strcmp(var, "format.cc")) { if (!value) return config_error_nonbool(var); @@ -872,6 +879,13 @@ static int header_callback(const struct option *opt, const char *arg, int unset) return 0; } +static int to_callback(const struct option *opt, const char *arg, int unset) +{ + ALLOC_GROW(extra_to, extra_to_nr + 1, extra_to_alloc); + extra_to[extra_to_nr++] = xstrdup(arg); + return 0; +} + static int cc_callback(const struct option *opt, const char *arg, int unset) { ALLOC_GROW(extra_cc, extra_cc_nr + 1, extra_cc_alloc); @@ -936,6 +950,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) { OPTION_CALLBACK, 0, "add-header", NULL, "header", "add email header", PARSE_OPT_NONEG, header_callback }, + { OPTION_CALLBACK, 0, "to", NULL, "email", "add To: header", + PARSE_OPT_NONEG, to_callback }, { OPTION_CALLBACK, 0, "cc", NULL, "email", "add Cc: header", PARSE_OPT_NONEG, cc_callback }, OPT_STRING(0, "in-reply-to", &in_reply_to, "message-id",
-- 1.6.6
