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

diff --git a/git-send-email.perl b/git-send-email.perl
index 57127aa823833f75fb546e738fcb19381fc331f7..546d2ebc0c72d4a330b3b40ca886af9340afb5af 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -821,7 +821,7 @@ Date: $date
 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";

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 9523305304cf9d062c11efaf9934176a813d8141..e426c96fb7d0f72b2822d4379b7fa671a04ab733 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -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