aboutsummaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-14 13:34:34 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-14 13:34:34 -0700
commit486d1a56443fb19770a7d1abe08f1f4e9e44534d (patch)
tree0c5b62e39b278cf08594c866ac65f45acf6ca0bf /builtin-log.c
parent29182f7da4b31b11f82281a9a03edd082975dceb (diff)
parent33c592ddd55faa96d0f425710da5742339796b89 (diff)
downloadgit-486d1a56443fb19770a7d1abe08f1f4e9e44534d.tar.gz
git-486d1a56443fb19770a7d1abe08f1f4e9e44534d.tar.xz
Merge branch 'mv/format-cc'
* mv/format-cc: Add tests for sendemail.cc configuration variable git-send-email: add a new sendemail.cc configuration variable git-format-patch: add a new format.cc configuration variable
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/builtin-log.c b/builtin-log.c
index 80a01f8d4..9d046b2e0 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -485,6 +485,13 @@ static int git_format_config(const char *var, const char *value)
fmt_patch_suffix = xstrdup(value);
return 0;
}
+ if (!strcmp(var, "format.cc")) {
+ if (!value)
+ return config_error_nonbool(var);
+ ALLOC_GROW(extra_cc, extra_cc_nr + 1, extra_cc_alloc);
+ extra_cc[extra_cc_nr++] = xstrdup(value);
+ return 0;
+ }
if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
return 0;
}