undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debugging cleanup improvements

Browse Source 
The debug output is much more helpful if it has the parameters that were used.
Pull the sendmail parameters into a seperate array for that, and also include
similar data during the Net::SMTP case.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Robin H. Johnson 2007-04-25 19:37:17 -07:00 committed by Junio C Hamano
parent 71c7da9421
commit 8e3d436b0b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-send-email.perl
View File

@ -465,15 +465,15 @@ X-Mailer: git-send-email $gitversion
$header .= join("\n", @xh) . "\n"; $header .= join("\n", @xh) . "\n";
} }
my @sendmail_parameters = ('-i', map { extract_valid_address($_) } @recipients);
if ($dry_run) { if ($dry_run) {
# We don't want to send the email. # We don't want to send the email.
} elsif ($smtp_server =~ m#^/#) { } elsif ($smtp_server =~ m#^/#) {
my $pid = open my $sm, '|-'; my $pid = open my $sm, '|-';
defined $pid or die $!; defined $pid or die $!;
if (!$pid) { if (!$pid) {
exec($smtp_server,'-i', exec($smtp_server, @sendmail_parameters) or die $!;
map { extract_valid_address($_) }
@recipients) or die $!;
} }
print $sm "$header\n$message"; print $sm "$header\n$message";
close $sm or die $?; close $sm or die $?;
@ -493,8 +493,10 @@ X-Mailer: git-send-email $gitversion
print (($dry_run ? "Dry-" : "")."OK. Log says:\nDate: $date\n"); print (($dry_run ? "Dry-" : "")."OK. Log says:\nDate: $date\n");
if ($smtp) { if ($smtp) {
print "Server: $smtp_server\n"; print "Server: $smtp_server\n";
print "MAIL FROM: $from\n";
print "RCPT TO: ".join(',',@recipients)."\n";
} else { } else {
print "Sendmail: $smtp_server\n"; print "Sendmail: $smtp_server ".join(' ',@sendmail_parameters)."\n";
} }
print "From: $from\nSubject: $subject\nCc: $cc\nTo: $to\n\n"; print "From: $from\nSubject: $subject\nCc: $cc\nTo: $to\n\n";
if ($smtp) { if ($smtp) {