diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2010-03-07 14:46:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-08 15:55:41 -0800 |
| commit | c42600346bb6c3427df7ea1c5a33d723ec02d731 (patch) | |
| tree | f0780075f41a3a2943da114ed119420e8e0d50c2 /builtin-log.c | |
| parent | ca9e0a1b8738959f5bd5a17ec81fa3bd1a326c9d (diff) | |
| download | git-c42600346bb6c3427df7ea1c5a33d723ec02d731.tar.gz git-c42600346bb6c3427df7ea1c5a33d723ec02d731.tar.xz | |
format-patch: add --no-cc, --no-to, and --no-add-headers
These new options allow users to override their config settings for
format.cc, format.to and format.headers respectively. These options
only make git ignore the config settings and any previous command line
options, so you'll still have to add more command line options to add
extra headers. For example,
$ cat .git/config
[format]
to = Someone <someone@out.there>
$ git format-patch -1 --no-to --to="Someone Else <else@out.there>"
would format a patch addressed to "Someone Else" and not "Someone".
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 | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/builtin-log.c b/builtin-log.c index 207dd1fa9..e14c0a2a0 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -869,19 +869,31 @@ static int inline_callback(const struct option *opt, const char *arg, int unset) static int header_callback(const struct option *opt, const char *arg, int unset) { - add_header(arg); + if (unset) { + string_list_clear(&extra_hdr, 0); + string_list_clear(&extra_to, 0); + string_list_clear(&extra_cc, 0); + } else { + add_header(arg); + } return 0; } static int to_callback(const struct option *opt, const char *arg, int unset) { - string_list_append(arg, &extra_to); + if (unset) + string_list_clear(&extra_to, 0); + else + string_list_append(arg, &extra_to); return 0; } static int cc_callback(const struct option *opt, const char *arg, int unset) { - string_list_append(arg, &extra_cc); + if (unset) + string_list_clear(&extra_cc, 0); + else + string_list_append(arg, &extra_cc); return 0; } @@ -940,12 +952,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) PARSE_OPT_NONEG | PARSE_OPT_NOARG }, OPT_GROUP("Messaging"), { OPTION_CALLBACK, 0, "add-header", NULL, "header", - "add email header", PARSE_OPT_NONEG, - header_callback }, + "add email header", 0, header_callback }, { OPTION_CALLBACK, 0, "to", NULL, "email", "add To: header", - PARSE_OPT_NONEG, to_callback }, + 0, to_callback }, { OPTION_CALLBACK, 0, "cc", NULL, "email", "add Cc: header", - PARSE_OPT_NONEG, cc_callback }, + 0, cc_callback }, OPT_STRING(0, "in-reply-to", &in_reply_to, "message-id", "make first mail a reply to <message-id>"), { OPTION_CALLBACK, 0, "attach", &rev, "boundary", |