Signed-off-by: Jens Stimpfle <debian@xxxxxxxxxxxx>
---
Notes:
This patch makes sure that "sob", "cc" and "bodycc" values for
sendemail.suppresscc option are handled, even when the email-addresses in
question are equal to the sender and "self" in not configured in
sendemail.suppresscc.
Sounds complicated, I know. But the current behaviour is really confusing: For
example, when sending, git-send-email logs
(mbox) Adding cc: Jens Stimpfle <debian@xxxxxxxxxxxx> from line 'From: Jens Stimpfle <debian@xxxxxxxxxxxx>'
(body) Adding cc: Jens Stimpfle <debian@xxxxxxxxxxxx> from line 'Signed-off-by: Jens Stimpfle <debian@xxxxxxxxxxxx>'
even though I have "sob" configured in sendemail.suppresscc.
With this patch, the suppression handling is also made consistent with the
handling of the "author" value.
git-send-email.perl | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 9949db0..452a783 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1377,11 +1377,8 @@ foreach my $t (@files) {
foreach my $addr (parse_address_line($1)) {
my $qaddr = unquote_rfc2047($addr);
my $saddr = sanitize_address($qaddr);
- if ($saddr eq $sender) {
- next if ($suppress_cc{'self'});
- } else {
- next if ($suppress_cc{'cc'});
- }
+ next if $suppress_cc{'cc'};
+ next if $suppress_cc{'self'} and $saddr eq $sender;
printf("(mbox) Adding cc: %s from line '%s'\n",
$addr, $_) unless $quiet;
push @cc, $addr;
@@ -1425,12 +1422,9 @@ foreach my $t (@files) {
my ($what, $c) = ($1, $2);
chomp $c;
my $sc = sanitize_address($c);
- if ($sc eq $sender) {
- next if ($suppress_cc{'self'});
- } else {
- next if $suppress_cc{'sob'} and $what =~ /Signed-off-by/i;
- next if $suppress_cc{'bodycc'} and $what =~ /Cc/i;
- }
+ next if $suppress_cc{'sob'} and $what =~ /Signed-off-by/i;
+ next if $suppress_cc{'bodycc'} and $what =~ /Cc/i;
+ next if $suppress_cc{'self'} and $sc eq $sender;
push @cc, $c;
printf("(body) Adding cc: %s from line '%s'\n",
$c, $_) unless $quiet;
--
2.1.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html