From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Sep 2007 20:07:20 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~449
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=88b7dd4597b11db4a99537519df91265fc7533e0;p=git.git

Merge branch 'maint'

* maint:
  stash: end index commit log with a newline
  git-commit: Disallow amend if it is going to produce an empty non-merge commit
  git-send-email.perl: Add angle brackets to In-Reply-To if necessary
  Fix a test failure (t9500-*.sh) on cygwin
---

88b7dd4597b11db4a99537519df91265fc7533e0
diff --cc git-send-email.perl
index dd7560b18,195fe6f70..d8319d45f
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@@ -361,10 -317,14 +361,11 @@@ if ($thread && !defined $initial_reply_
  	} while (!defined $_);
  
  	$initial_reply_to = $_;
- 	$initial_reply_to =~ s/(^\s+|\s+$)//g;
+ 	$initial_reply_to =~ s/^\s+<?/</;
+ 	$initial_reply_to =~ s/>?\s+$/>/;
  }
  
 -if (!$smtp_server) {
 -	$smtp_server = $repo->config('sendemail.smtpserver');
 -}
 -if (!$smtp_server) {
 +if (!defined $smtp_server) {
  	foreach (qw( /usr/sbin/sendmail /usr/lib/sendmail )) {
  		if (-x $_) {
  			$smtp_server = $_;