From: Junio C Hamano <junkio@cox.net>
Date: Thu, 19 Oct 2006 05:09:00 +0000 (-0700)
Subject: Merge branch 'jc/send-email'
X-Git-Tag: v1.4.4-rc1~85
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2dcd3ce8d38101d87c2d329cf46387038ac2c766;p=git.git

Merge branch 'jc/send-email'

* jc/send-email:
  Make git-send-email detect mbox-style patches more readily
  git-send-email: real name with period need to be dq-quoted on From: line
  git-send-email: do not drop custom headers the user prepared
---

2dcd3ce8d38101d87c2d329cf46387038ac2c766
diff --cc git-send-email.perl
index 04c894225,eb9127089..b17d26198
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@@ -424,10 -427,11 +429,13 @@@ X-Mailer: git-send-email $gitversio
  		$header .= "In-Reply-To: $reply_to\n";
  		$header .= "References: $references\n";
  	}
+ 	if (@xh) {
+ 		$header .= join("\n", @xh) . "\n";
+ 	}
  
 -	if ($smtp_server =~ m#^/#) {
 +	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) {