send-email: fix threaded mails without chain-reply-to
An earlier commit 15da108 ("send-email: 'References:' should only reference what is sent", 2009-04-13) broke logic to set up threading information for the next message by rewriting "!" to "not" without understanding the precedence rules of the language. Namely, ! defined $reply_to || length($reply_to) == 0 was changed to not defined $reply_to || length($reply_to) == 0 which is not (defined $reply_to || length($reply_to) == 0) and different from what was intended, which is (not defined $reply_to) || (length($reply_to) == 0) Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Markus Heidelberg committed
Jun 12, 2009 at 12:51 UTC
f74fe34b96816bad1f568202ec51ef18ae7513b3
2 files changed
+3
-2
git-send-email.perl
+2
-1
@@ -1150,7 +1150,8 @@ foreach my $t (@files) {
1150
my $message_was_sent = send_message();
1151
1152
# set up for the next message
1153
- if ($message_was_sent and $chain_reply_to || not defined $reply_to || length($reply_to) == 0) {
1153
+ if ($message_was_sent &&
1154
+ ($chain_reply_to || !defined $reply_to || length($reply_to) == 0)) {
1155
$reply_to = $message_id;
1156
if (length $references > 0) {
1157
$references .= "\n $message_id";
t/t9001-send-email.sh
+1
-1
@@ -621,7 +621,7 @@ test_expect_success 'in-reply-to but no threading' '
621
grep "In-Reply-To: <in-reply-id@example.com>"
622
'
623
624
-test_expect_failure 'threading but no chain-reply-to' '
624
+test_expect_success 'threading but no chain-reply-to' '
625
git send-email \
626
--dry-run \
627
--from="Example <nobody@example.com>" \