From mboxrd@z Thu Jan 1 00:00:00 1970 From: Markus Heidelberg Subject: [PATCH 5/6] send-email: fix threaded mails without chain-reply-to Date: Fri, 12 Jun 2009 12:51:41 +0200 Message-ID: <1244803902-8068-5-git-send-email-markus.heidelberg@web.de> References: <1244803766-7785-1-git-send-email-markus.heidelberg@web.de> Cc: git@vger.kernel.org, Michael Witten , Thomas Rast , Markus Heidelberg , Junio C Hamano To: Junio C Hamano X-From: git-owner@vger.kernel.org Fri Jun 12 12:52:31 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1MF4N3-0002Bm-LK for gcvg-git-2@gmane.org; Fri, 12 Jun 2009 12:52:30 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933744AbZFLKvz (ORCPT ); Fri, 12 Jun 2009 06:51:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933709AbZFLKvy (ORCPT ); Fri, 12 Jun 2009 06:51:54 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:41115 "EHLO fmmailgate01.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933680AbZFLKvq (ORCPT ); Fri, 12 Jun 2009 06:51:46 -0400 Received: from smtp08.web.de (fmsmtp08.dlan.cinetic.de [172.20.5.216]) by fmmailgate01.web.de (Postfix) with ESMTP id C55671053DC6C; Fri, 12 Jun 2009 12:51:48 +0200 (CEST) Received: from [89.59.124.123] (helo=localhost.localdomain) by smtp08.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #277) id 1MF4MO-00044V-01; Fri, 12 Jun 2009 12:51:48 +0200 X-Mailer: git-send-email 1.6.3.2.236.ge505d In-Reply-To: <1244803766-7785-1-git-send-email-markus.heidelberg@web.de> X-Sender: markus.heidelberg@web.de X-Provags-ID: V01U2FsdGVkX19j47tEBjkU1eQ+cwkT0eDCDD+/kmGVLvv8GWhC zCGA4ulpqtclWVvvUjdYQ4lauC31lHXJ/OkBm++aGYS6oLyGpf m/GvVJiK3xWUcxR5DqHg== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 Signed-off-by: Junio C Hamano --- * Applies on top of [4/6] git-send-email.perl | 3 ++- t/t9001-send-email.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 4c795a4..16d12e0 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1150,7 +1150,8 @@ foreach my $t (@files) { my $message_was_sent = send_message(); # set up for the next message - if ($message_was_sent and $chain_reply_to || not defined $reply_to || length($reply_to) == 0) { + if ($message_was_sent && + ($chain_reply_to || !defined $reply_to || length($reply_to) == 0)) { $reply_to = $message_id; if (length $references > 0) { $references .= "\n $message_id"; diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 4f67de3..8ab1a78 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -621,7 +621,7 @@ test_expect_success 'in-reply-to but no threading' ' grep "In-Reply-To: " ' -test_expect_failure 'threading but no chain-reply-to' ' +test_expect_success 'threading but no chain-reply-to' ' git send-email \ --dry-run \ --from="Example " \ -- 1.6.3.2.236.ge505d