send-email: automatic envelope sender

diff --git a/git-send-email.perl b/git-send-email.perl
index f5ba4e7699936499021a8a955b198668b98a1696..9f44e2964a52b84ac3d03b2bbafab8ae3d6a6d2a 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -861,7 +861,9 @@ sub send_message
 
        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);