This adds tocmd option to suppress-cc command which already supports cccmd and others. Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx> --- Documentation/git-send-email.txt | 1 + git-send-email.perl | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 9d66166f69d9..f1634f7db3df 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -307,6 +307,7 @@ Automating patch body (commit message) except for self (use 'self' for that). - 'sob' will avoid including anyone mentioned in Signed-off-by lines except for self (use 'self' for that). +- 'tocmd' will avoid running the --to-cmd. - 'cccmd' will avoid running the --cc-cmd. - 'body' is equivalent to 'sob' + 'bodycc' - 'all' will suppress all auto cc values. diff --git a/git-send-email.perl b/git-send-email.perl index eea0a517f71b..cc3cd984aee4 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -85,7 +85,7 @@ git send-email --dump-aliases --identity <str> * Use the sendemail.<id> options. --to-cmd <str> * Email To: via `<str> \$patch_path` --cc-cmd <str> * Email Cc: via `<str> \$patch_path` - --suppress-cc <str> * author, self, sob, cc, cccmd, body, bodycc, all. + --suppress-cc <str> * author, self, sob, cc, tocmd, cccmd, body, bodycc, all. --[no-]cc-cover * Email Cc: addresses in the cover letter. --[no-]to-cover * Email To: addresses in the cover letter. --[no-]signed-off-by-cc * Send to Signed-off-by: addresses. Default on. @@ -435,13 +435,13 @@ my(%suppress_cc); if (@suppress_cc) { foreach my $entry (@suppress_cc) { die sprintf(__("Unknown --suppress-cc field: '%s'\n"), $entry) - unless $entry =~ /^(?:all|cccmd|cc|author|self|sob|body|bodycc)$/; + unless $entry =~ /^(?:all|tocmd|cccmd|cc|author|self|sob|body|bodycc)$/; $suppress_cc{$entry} = 1; } } if ($suppress_cc{'all'}) { - foreach my $entry (qw (cccmd cc author self sob body bodycc)) { + foreach my $entry (qw (tocmd cccmd cc author self sob body bodycc)) { $suppress_cc{$entry} = 1; } delete $suppress_cc{'all'}; @@ -1582,7 +1582,7 @@ foreach my $t (@files) { close $fh; push @to, recipients_cmd("to-cmd", "to", $to_cmd, $t) - if defined $to_cmd; + if defined $to_cmd && !$suppress_cc{'tocmd'}; push @cc, recipients_cmd("cc-cmd", "cc", $cc_cmd, $t) if defined $cc_cmd && !$suppress_cc{'cccmd'}; -- 2.13.0.70.g6367777092d9