diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-18 01:54:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-18 01:54:46 (GMT) |
| commit | a57ca9dd400c8459a3cd3d769bab317f57d1e9ac (patch) | |
| tree | 5ef12ca145a361be0654577eee8021ba9cf90a4e | |
| parent | a9bfe813094cf2c8ea0e30c3196070c868fb294c (diff) | |
| parent | aaab4b9fb97c1f638d02be7b8c432a4d57f37c56 (diff) | |
| download | git-a57ca9dd400c8459a3cd3d769bab317f57d1e9ac.zip git-a57ca9dd400c8459a3cd3d769bab317f57d1e9ac.tar.gz git-a57ca9dd400c8459a3cd3d769bab317f57d1e9ac.tar.bz2 | |
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
| -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 57127aa..546d2eb 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 9523305..e426c96 100755 --- 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 |