From: Robin H. Johnson <robbat2@xxxxxxxxxx>
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@xxxxxxxxxx>
---
git-send-email.perl | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 00f8181..8af235f 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -468,15 +468,15 @@ X-Mailer: git-send-email $gitversion
$header .= join("\n", @xh) . "\n";
}
+ my @sendmail_parameters = ('-i', map { extract_valid_address($_) } @recipients);
+
if ($dry_run) {
# We don't want to send the email.
} elsif ($smtp_server =~ m#^/#) {
my $pid = open my $sm, '|-';
defined $pid or die $!;
if (!$pid) {
- exec($smtp_server,'-i',
- map { extract_valid_address($_) }
- @recipients) or die $!;
+ exec($smtp_server, @sendmail_parameters) or die $!;
}
print $sm "$header\n$message";
close $sm or die $?;
@@ -496,8 +496,10 @@ X-Mailer: git-send-email $gitversion
print (($dry_run ? "Dry-" : "")."OK. Log says:\nDate: $date\n");
if ($smtp) {
print "Server: $smtp_server\n";
+ print "MAIL FROM: $from\n";
+ print "RCPT TO: ".join(',',@recipients)."\n";
} 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";
if ($smtp) {
--
1.5.2.rc0.43.g2f4c7
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html