send-email: apply --suppress-from to S-o-b and cc-cmd

Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Cc: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index e38b7021b4d38c07bd794e59be0a5e0747a8b775..659215ac7221d5c8b6aa78bef2fcadce24ada8c3 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -113,8 +113,7 @@ The --cc option must be repeated for each user you want on the cc list.
        is not set, this will be prompted for.
 
 --suppress-from, --no-suppress-from::
        is not set, this will be prompted for.
 
 --suppress-from, --no-suppress-from::

-        If this is set, do not add the From: address to the cc: list, if it
-        shows up in a From: line.
+        If this is set, do not add the From: address to the cc: list.

         Default is the value of 'sendemail.suppressfrom' configuration value;
         if that is unspecified, default to --no-suppress-from.
 
         Default is the value of 'sendemail.suppressfrom' configuration value;
         if that is unspecified, default to --no-suppress-from.
 

diff --git a/git-send-email.perl b/git-send-email.perl
index 96051bc01e1585a69a3e0746bbef7016ec01663e..f4b8f96511b17e084163e2289c620f8793c10d87 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -88,8 +88,7 @@ sub usage {
 
    --smtp-ssl     If set, connects to the SMTP server using SSL.
 
 
    --smtp-ssl     If set, connects to the SMTP server using SSL.
 

-   --suppress-from Suppress sending emails to yourself if your address
-                  appears in a From: line. Defaults to off.
+   --suppress-from Suppress sending emails to yourself. Defaults to off.

 
    --thread       Specify that the "In-Reply-To:" header should be set on all
                   emails. Defaults to on.
 
    --thread       Specify that the "In-Reply-To:" header should be set on all
                   emails. Defaults to on.


@@ -730,6 +729,7 @@ sub send_message
                        if (/^(Signed-off-by|Cc): (.*)$/i && $signed_off_cc) {
                                my $c = $2;
                                chomp $c;
                        if (/^(Signed-off-by|Cc): (.*)$/i && $signed_off_cc) {
                                my $c = $2;
                                chomp $c;

+                               next if ($c eq $sender and $suppress_from);

                                push @cc, $c;
                                printf("(sob) Adding cc: %s from line '%s'\n",
                                        $c, $_) unless $quiet;
                                push @cc, $c;
                                printf("(sob) Adding cc: %s from line '%s'\n",
                                        $c, $_) unless $quiet;


@@ -745,6 +745,7 @@ sub send_message
                        my $c = $_;
                        $c =~ s/^\s*//g;
                        $c =~ s/\n$//g;
                        my $c = $_;
                        $c =~ s/^\s*//g;
                        $c =~ s/\n$//g;

+                       next if ($c eq $sender and $suppress_from);

                        push @cc, $c;
                        printf("(cc-cmd) Adding cc: %s from: '%s'\n",
                                $c, $cc_cmd) unless $quiet;
                        push @cc, $c;
                        printf("(cc-cmd) Adding cc: %s from: '%s'\n",
                                $c, $cc_cmd) unless $quiet;