Merge branch 'fc/send-email-envelope'

[git.git] / git-send-email.perl

diff --git a/git-send-email.perl b/git-send-email.perl
index 6bd4bbc81a33b7402b5152342e4daac3ce89c0a4..319b5356713b02a48508ee9af2d14781d8760e94 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -877,7 +877,9 @@ X-Mailer: git-send-email $gitversion
 
        my @sendmail_parameters = ('-i', @recipients);
        my $raw_from = $sanitized_sender;
-       $raw_from = $envelope_sender if (defined $envelope_sender);
+       if (defined $envelope_sender && $envelope_sender ne "auto") {
+               $raw_from = $envelope_sender;
+       }
        $raw_from = extract_valid_address($raw_from);
        unshift (@sendmail_parameters,
                        '-f', $raw_from) if(defined $envelope_sender);