mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-19 09:26:09 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2009-03-17 18:54:46 -07:00
parent a9bfe81309 aaab4b9fb9
commit a57ca9dd40
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-send-email.perl
View File

@ -821,7 +821,7 @@ sub send_message
Message-Id: $message_id
X-Mailer: git-send-email $gitversion
";
if ($thread && $reply_to) {
if ($reply_to) {
$header .= "In-Reply-To: $reply_to\n";
$header .= "References: $references\n";

11
t/t9001-send-email.sh
View File

@ -531,4 +531,15 @@ test_expect_success 'feed two files' '
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