summaryrefslogtreecommitdiff
path: root/t/t9001-send-email.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-17 18:54:46 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-17 18:54:46 -0700
commita57ca9dd400c8459a3cd3d769bab317f57d1e9ac (patch)
tree5ef12ca145a361be0654577eee8021ba9cf90a4e /t/t9001-send-email.sh
parenta9bfe813094cf2c8ea0e30c3196070c868fb294c (diff)
parentaaab4b9fb97c1f638d02be7b8c432a4d57f37c56 (diff)
downloadgit-a57ca9dd400c8459a3cd3d769bab317f57d1e9ac.tar.gz
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
Diffstat (limited to 't/t9001-send-email.sh')
-rwxr-xr-xt/t9001-send-email.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 9523305304..e426c96fb7 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