mirror of
https://github.com/git/git.git
synced 2024-11-28 12:34:08 +08:00
Allow users to optionally specify their envelope sender.
If your normal user is not the same user you are subscribed to a list with, then the default envelope sender used will cause your messages to bounce or silently vanish into the ether. This patch provides an optional parameter to set the envelope sender. To use it with the sendmail binary, you must have privileges to use the -f parameter! Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
2b69bfc23d
commit
f073a592d6
@ -79,6 +79,8 @@ Options:
|
|||||||
|
|
||||||
--dry-run Do everything except actually send the emails.
|
--dry-run Do everything except actually send the emails.
|
||||||
|
|
||||||
|
--envelope-sender Specify the envelope sender used to send the emails.
|
||||||
|
|
||||||
EOT
|
EOT
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
@ -139,6 +141,7 @@ my (@to,@cc,@initial_cc,@bcclist,@xh,
|
|||||||
my ($chain_reply_to, $quiet, $suppress_from, $no_signed_off_cc,
|
my ($chain_reply_to, $quiet, $suppress_from, $no_signed_off_cc,
|
||||||
$dry_run) = (1, 0, 0, 0, 0);
|
$dry_run) = (1, 0, 0, 0, 0);
|
||||||
my $smtp_server;
|
my $smtp_server;
|
||||||
|
my $envelope_sender;
|
||||||
|
|
||||||
# Example reply to:
|
# Example reply to:
|
||||||
#$initial_reply_to = ''; #<20050203173208.GA23964@foobar.com>';
|
#$initial_reply_to = ''; #<20050203173208.GA23964@foobar.com>';
|
||||||
@ -177,6 +180,7 @@ my $rc = GetOptions("from=s" => \$from,
|
|||||||
"suppress-from" => \$suppress_from,
|
"suppress-from" => \$suppress_from,
|
||||||
"no-signed-off-cc|no-signed-off-by-cc" => \$no_signed_off_cc,
|
"no-signed-off-cc|no-signed-off-by-cc" => \$no_signed_off_cc,
|
||||||
"dry-run" => \$dry_run,
|
"dry-run" => \$dry_run,
|
||||||
|
"envelope-sender=s" => \$envelope_sender,
|
||||||
);
|
);
|
||||||
|
|
||||||
unless ($rc) {
|
unless ($rc) {
|
||||||
@ -476,7 +480,11 @@ X-Mailer: git-send-email $gitversion
|
|||||||
}
|
}
|
||||||
|
|
||||||
my @sendmail_parameters = ('-i', @recipients);
|
my @sendmail_parameters = ('-i', @recipients);
|
||||||
my $raw_from = extract_valid_address($from);
|
my $raw_from = $from;
|
||||||
|
$raw_from = $envelope_sender if (defined $envelope_sender);
|
||||||
|
$raw_from = extract_valid_address($raw_from);
|
||||||
|
unshift (@sendmail_parameters,
|
||||||
|
'-f', $raw_from) if(defined $envelope_sender);
|
||||||
|
|
||||||
if ($dry_run) {
|
if ($dry_run) {
|
||||||
# We don't want to send the email.
|
# We don't want to send the email.
|
||||||
|
Loading…
Reference in New Issue
Block a user