From 736cc67dd7f4f8004215e24f876178e6f34c191d Mon Sep 17 00:00:00 2001 From: Daniel Barkalow Date: Tue, 19 Feb 2008 02:40:35 -0500 Subject: [PATCH] Support a --cc= option in format-patch When you have particular reviewers you want to sent particular series to, it's nice to be able to generate the whole series with them as additional recipients, without configuring them into your general headers or adding them by hand afterwards. Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano --- Documentation/git-format-patch.txt | 5 +++++ builtin-log.c | 4 ++++ t/t4014-format-patch.sh | 8 ++++++++ 3 files changed, 17 insertions(+) diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index b27bb9476d..b5207b7604 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -17,6 +17,7 @@ SYNOPSIS [--in-reply-to=Message-Id] [--suffix=.] [--ignore-if-in-upstream] [--subject-prefix=Subject-Prefix] + [--cc=] [--cover-letter] [ | ] @@ -136,6 +137,10 @@ include::diff-options.txt[] allows for useful naming of a patch series, and can be combined with the --numbered option. +--cc=:: + Add a "Cc:" header to the email headers. This is in addition + to any configured headers, and may be used multiple times. + --cover-letter:: Generate a cover letter template. You still have to fill in a description, but the shortlog and the diffstat will be diff --git a/builtin-log.c b/builtin-log.c index 71ae55b9eb..0b348eb6b3 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -771,6 +771,10 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) die("Need a number for --start-number"); start_number = strtol(argv[i], NULL, 10); } + else if (!prefixcmp(argv[i], "--cc=")) { + ALLOC_GROW(extra_cc, extra_cc_nr + 1, extra_cc_alloc); + extra_cc[extra_cc_nr++] = xstrdup(argv[i] + 5); + } else if (!strcmp(argv[i], "-k") || !strcmp(argv[i], "--keep-subject")) { keep_subject = 1; diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 43d8841d7d..a39e786f71 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -122,6 +122,14 @@ test_expect_success 'extra headers with multiple To:s' ' grep "^ *S. E. Cipient $" hdrs4 ' +test_expect_success 'additional command line cc' ' + + git config --replace-all format.headers "Cc: R. E. Cipient " && + git format-patch --cc="S. E. Cipient " --stdout master..side | sed -e "/^$/Q" >patch5 && + grep "^Cc: R. E. Cipient ,$" patch5 && + grep "^ *S. E. Cipient $" patch5 +' + test_expect_success 'multiple files' ' rm -rf patches/ && -- 2.11.4.GIT