git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Robin H\. Johnson" <robbat2@gentoo.org>
To: git@vger.kernel.org
Cc: Junio C Hamano <junkio@cox.net>,
	"Robin H\. Johnson" <robbat2@gentoo.org>
Subject: [PATCH 3/9] Debugging cleanup improvements
Date: Wed, 25 Apr 2007 19:37:17 -0700	[thread overview]
Message-ID: <11775550432268-git-send-email-robbat2@gentoo.org> (raw)
In-Reply-To: <1177555043272-git-send-email-robbat2@gentoo.org>

From: Robin H. Johnson <robbat2@gentoo.org>

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>
---
 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

  reply	other threads:[~2007-04-26  2:37 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-26  2:37 git-send-email fixes, cleanups and improvements Robin H. Johnson
2007-04-26  2:37 ` [PATCH 1/9] Document --dry-run parameter to send-email Robin H. Johnson
2007-04-26  2:37   ` [PATCH 2/9] Prefix Dry- to the message status to denote dry-runs Robin H. Johnson
2007-04-26  2:37     ` Robin H. Johnson [this message]
2007-04-26  2:37       ` [PATCH 4/9] Change the scope of the $cc variable as it is not needed outside of send_message Robin H. Johnson
2007-04-26  2:37         ` [PATCH 5/9] Perform correct quoting of recipient names Robin H. Johnson
2007-04-26  2:37           ` [PATCH 6/9] Validate @recipients before using it for sendmail and Net::SMTP Robin H. Johnson
2007-04-26  2:37             ` [PATCH 7/9] Ensure clean addresses are always used with Net::SMTP Robin H. Johnson
2007-04-26  2:37               ` [PATCH 8/9] Allow users to optionally specify their envelope sender Robin H. Johnson
2007-04-26  2:37                 ` [PATCH 9/9] Document --dry-run and envelope-sender for git-send-email Robin H. Johnson
2007-04-26  4:15           ` [PATCH 5/9] Perform correct quoting of recipient names Junio C Hamano
2007-04-26  4:41             ` Robin H. Johnson
2007-04-26  4:53               ` [PATCH 10/9] Sanitize @to recipients Robin H. Johnson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11775550432268-git-send-email-robbat2@gentoo.org \
    --to=robbat2@gentoo.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).