[PATCH 1/3] send-email: correct logic error with --suppress-cc=cc
From: Jay Soffian <jaysoffian@gmail.com>
--suppress-cc=cc is supposed to suppress harvesting addresses from any
Cc: lines. However, in the case where the Cc: line contained the sender,
it would only suppress if --suppress-cc=self.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
git-send-email.perl | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index cde294c..a2e0b94 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -965,12 +965,10 @@ foreach my $t (@files) {
push @cc, $1;
}
elsif (/^Cc:\s+(.*)$/) {
+ next if $suppress_cc{'cc'};
foreach my $addr (parse_address_line($1)) {
- if (unquote_rfc2047($addr) eq $sender) {
- next if ($suppress_cc{'self'});
- } else {
- next if ($suppress_cc{'cc'});
- }
+ next if $suppress_cc{'self'} and
+ unquote_rfc2047($addr) eq $sender;
printf("(mbox) Adding cc: %s from line '%s'\n",
$addr, $_) unless $quiet;
push @cc, $addr;
--
1.6.2.rc0.235.g1319
Jay Soffian <jaysoffian@gmail.com>