global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mh/send-email-reset-in-reply-to'

Browse Source 
Even when running "git send-email" without its own threaded
discussion support, a threading related header in one message is
carried over to the subsequent message to result in an unwanted
threading, which has been corrected.

* mh/send-email-reset-in-reply-to:
  send-email: avoid incorrect header propagation
This commit is contained in:
Junio C Hamano
2021-09-10 11:46:25 -07:00
parent 0538a2586e e082113484
commit bd29bcf913
2 changed files with 62 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2227,6 +2227,51 @@ test_expect_success $PREREQ 'test shell expression with --sendmail-cmd' '
test_path_is_file commandline1
'
test_expect_success $PREREQ 'set up in-reply-to/references patches' '
cat >has-reply.patch <<-\EOF &&
From: A U Thor <author@example.com>
Subject: patch with in-reply-to
Message-ID: <patch.with.in.reply.to@example.com>
In-Reply-To: <replied.to@example.com>
References: <replied.to@example.com>
This is the body.
EOF
cat >no-reply.patch <<-\EOF
From: A U Thor <author@example.com>
Subject: patch without in-reply-to
Message-ID: <patch.without.in.reply.to@example.com>
This is the body.
EOF
'
test_expect_success $PREREQ 'patch reply headers correct with --no-thread' '
clean_fake_sendmail &&
git send-email \
--no-thread \
--to=nobody@example.com \
--smtp-server="$(pwd)/fake.sendmail" \
has-reply.patch no-reply.patch &&
grep "In-Reply-To: <replied.to@example.com>" msgtxt1 &&
grep "References: <replied.to@example.com>" msgtxt1 &&
! grep replied.to@example.com msgtxt2
'
test_expect_success $PREREQ 'cmdline in-reply-to used with --no-thread' '
clean_fake_sendmail &&
git send-email \
--no-thread \
--in-reply-to="<cmdline.reply@example.com>" \
--to=nobody@example.com \
--smtp-server="$(pwd)/fake.sendmail" \
has-reply.patch no-reply.patch &&
grep "In-Reply-To: <cmdline.reply@example.com>" msgtxt1 &&
grep "References: <cmdline.reply@example.com>" msgtxt1 &&
grep "In-Reply-To: <cmdline.reply@example.com>" msgtxt2 &&
grep "References: <cmdline.reply@example.com>" msgtxt2
'
test_expect_success $PREREQ 'invoke hook' '
mkdir -p .git/hooks &&