summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-30 22:42:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-30 22:42:50 (GMT)
commit0c7cc135c52b7c573710f247fc55ea1bf677f1bc (patch)
treef311a31e2cf038a7039aeb61049ea695b781366e /git-send-email.perl
parenta689faeb5850174edfbbb0a502ef7eee8cd06d76 (diff)
parentc89e32414516e906520e9bdd809560971eb52ef5 (diff)
downloadgit-0c7cc135c52b7c573710f247fc55ea1bf677f1bc.zip
git-0c7cc135c52b7c573710f247fc55ea1bf677f1bc.tar.gz
git-0c7cc135c52b7c573710f247fc55ea1bf677f1bc.tar.bz2
Merge branch 'fc/send-email-envelope'
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 6bd4bbc..319b535 100755
--- 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);