diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-21 23:09:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-21 23:09:21 -0700 |
| commit | 923cc82c481a99269d397dc86f8b664ba8cb98da (patch) | |
| tree | 4fbd4c8d180bf95f21722aa77de0e4f350cefe26 | |
| parent | Merge branch 'mg/maint-submodule-normalize-path' into maint (diff) | |
| parent | send-email: test --no-thread --in-reply-to combination (diff) | |
| download | tgif-923cc82c481a99269d397dc86f8b664ba8cb98da.tar.xz | |
Merge branch 'tr/maint-1.6.0-send-email-irt' into maint
* 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
| -rwxr-xr-x | git-send-email.perl | 2 | ||||
| -rwxr-xr-x | t/t9001-send-email.sh | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index adf7ecb5c3..09fe3d95c4 100755 --- 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 4df4f965cb..d7634187aa 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -455,4 +455,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 |