diff options
| author |  Steven Drake <sdrake@xnet.co.nz> | 2010-02-17 12:39:34 +1300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-06 19:57:44 -0800 |
| commit | ae6c098f158dd306462024c5cb137b8f7f65cfbd (patch) | |
| tree | d6e41a6cfeb592cf2f41bfc86c7403827c73280b /builtin-log.c | |
| parent | Git 1.7.0 (diff) | |
| download | tgif-ae6c098f158dd306462024c5cb137b8f7f65cfbd.tar.xz | |
Add 'git format-patch --to=' option and 'format.to' configuration variable.
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.
[jc: tests are by Stephen Boyd]
Signed-off-by: Steven Drake <sdrake@xnet.co.nz>
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/builtin-log.c b/builtin-log.c index 8d16832f7e..5d23a67993 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -504,6 +504,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); @@ -875,6 +882,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); @@ -939,6 +953,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", |