From: Felipe Contreras Date: Sat, 21 Nov 2009 17:43:30 GMT Subject: [PATCH] send-email: new 'add-envelope' option Message-ID: <1258825410-28592-1-git-send-email-felipe.contreras@gmail.com> Some MTAs make smart decisions based on the 'from' envelope (i.e. msmtp) Signed-off-by: Felipe Contreras --- git-send-email.perl | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index a0279de..92bf491 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -140,6 +140,7 @@ my (@to,@cc,@initial_cc,@bcclist,@xh, $author,$sender,$smtp_authpass,$annotate,$compose,$time); my $envelope_sender; +my $envelope_from; # Example reply to: #$initial_reply_to = ''; #<20050203173208.GA23964@foobar.com>'; @@ -208,6 +209,7 @@ my %config_settings = ( "aliasesfile" => \@alias_files, "suppresscc" => \@suppress_cc, "envelopesender" => \$envelope_sender, + "envelopefrom" => \$envelope_from, "multiedit" => \$multiedit, "confirm" => \$confirm, "from" => \$sender, @@ -265,6 +267,7 @@ my $rc = GetOptions("sender|from=s" => \$sender, "confirm=s" => \$confirm, "dry-run" => \$dry_run, "envelope-sender=s" => \$envelope_sender, + "envelope-from" => \$envelope_from, "thread!" => \$thread, "validate!" => \$validate, "format-patch!" => \$format_patch, @@ -861,10 +864,13 @@ 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) { + $raw_from = $envelope_sender; + $envelope_from = 1; + } $raw_from = extract_valid_address($raw_from); unshift (@sendmail_parameters, - '-f', $raw_from) if(defined $envelope_sender); + '-f', $raw_from) if(defined $envelope_from); if ($needs_confirm && !$dry_run) { print "\n$header\n"; -- 1.6.5.3.1.ga9388c