From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Mar 2009 01:54:46 +0000 (-0700)
Subject: Merge branch 'tr/maint-1.6.0-send-email-irt'
X-Git-Tag: v1.6.3-rc0~146
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a57ca9dd400c8459a3cd3d769bab317f57d1e9ac;p=git.git

Merge branch 'tr/maint-1.6.0-send-email-irt'

* tr/maint-1.6.0-send-email-irt:
  send-email: test --no-thread --in-reply-to combination
  send-email: respect in-reply-to regardless of threading

Conflicts:
	t/t9001-send-email.sh
---

a57ca9dd400c8459a3cd3d769bab317f57d1e9ac
diff --cc t/t9001-send-email.sh
index 952330530,a404204b1..e426c96fb
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@@ -510,25 -292,15 +510,36 @@@ test_expect_success '--compose adds MIM
  	grep "^Subject: =?utf-8?q?utf8-s=C3=BCbj=C3=ABct?=" msgtxt1
  '
  
 +test_expect_success 'detects ambiguous reference/file conflict' '
 +	echo master > master &&
 +	git add master &&
 +	git commit -m"add master" &&
 +	test_must_fail git send-email --dry-run master 2>errors &&
 +	grep disambiguate errors
 +'
 +
 +test_expect_success 'feed two files' '
 +	rm -fr outdir &&
 +	git format-patch -2 -o outdir &&
 +	git send-email \
 +	--dry-run \
 +	--from="Example <nobody@example.com>" \
 +	--to=nobody@example.com \
 +	outdir/000?-*.patch 2>errors >out &&
 +	grep "^Subject: " out >subjects &&
 +	test "z$(sed -n -e 1p subjects)" = "zSubject: [PATCH 1/2] Second." &&
 +	test "z$(sed -n -e 2p subjects)" = "zSubject: [PATCH 2/2] add master"
 +'
 +
+ test_expect_success 'in-reply-to but no threading' '
+ 	git send-email \
+ 		--dry-run \
+ 		--from="Example <nobody@example.com>" \
+ 		--to=nobody@example.com \
+ 		--in-reply-to="<in-reply-id@example.com>" \
+ 		--no-thread \
+ 		$patches |
+ 	grep "In-Reply-To: <in-reply-id@example.com>"
+ '
+ 
  test_done