From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41F6CC432BE for ; Mon, 30 Aug 2021 15:30:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A48760ED4 for ; Mon, 30 Aug 2021 15:30:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237266AbhH3Pbi (ORCPT ); Mon, 30 Aug 2021 11:31:38 -0400 Received: from mout02.posteo.de ([185.67.36.66]:46363 "EHLO mout02.posteo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237085AbhH3Pbi (ORCPT ); Mon, 30 Aug 2021 11:31:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2A037240107 for ; Mon, 30 Aug 2021 17:30:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1630337442; bh=opAvIpUgW2baVJipIPk3YmsoptbVKJ2am1Bf4Aq89aw=; h=From:To:Cc:Subject:Date:From; b=JhGsJNz/aDjbpcX3eJuFc9SkL3aJMNWlaX5qQZ/Cux9fNAkkKLqIJOnBAIwW33X9+ 8BzcmMZlh/uNE4hDMBdyR7IoGok/wu7FzV2BLT2DbXcy7OBrPvCl9xwn3lmCV7O8tY RBh7Ehk6uE5UDuBiwWZH7dB1YGJxCNRqQZbU9XbVqv8qxSASdwYOgZrr5Sf/yRhqfq k8BJPYybevCK+IljcFRvqDExAtnvgl7lb/DglSUNvLmIlC04G4oJyuLOUjTrixqQ1T VTJU7+NFWH5fLZEgzmK80Wx5XtLSaEIk+vCsiY9sZzNZ0lHvCHWVfvzrkZAMxCR0Sw cq0jrVCgzrf7Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4GyvR36SrMz9rxR; Mon, 30 Aug 2021 17:30:39 +0200 (CEST) From: =?UTF-8?q?Marvin=20H=C3=A4user?= To: git@vger.kernel.org Cc: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= , Jeff King , =?UTF-8?q?Marvin=20H=C3=A4user?= , Junio C Hamano , Drew DeVault , Simon Ser , xiaoqiang zhao , Jonathan Tan , Christian Ludwig Subject: [PATCH] send-email: Avoid incorrect header propagation Date: Mon, 30 Aug 2021 15:30:01 +0000 Message-Id: <20210830153001.29961-1-mhaeuser@posteo.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org If multiple independent patches are sent with send-email, even if the "In-Reply-To" and "References" headers are not managed by --thread or --in-reply-to, their values may be propagated from prior patches to subsequent patches with no such headers defined. To mitigate this and potential future issues, make sure all global patch-specific variables are always either handled by command-specific code (e.g. threading), or are reset to their default values for every iteration. Signed-off-by: Jeff King Signed-off-by: Marvin Häuser --- git-send-email.perl | 26 ++++++++++++++++--------- t/t9001-send-email.sh | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 9 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 25be2ebd2a..e411860b18 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1625,7 +1625,6 @@ sub send_message { $in_reply_to = $initial_in_reply_to; $references = $initial_in_reply_to || ''; -$subject = $initial_subject; $message_num = 0; # Prepares the email, prompts the user, sends it out @@ -1648,6 +1647,7 @@ sub process_file { @xh = (); my $input_format = undef; my @header = (); + $subject = $initial_subject; $message = ""; $message_num++; # First unfold multiline header fields @@ -1854,15 +1854,23 @@ sub process_file { } # set up for the next message - if ($thread && $message_was_sent && - ($chain_reply_to || !defined $in_reply_to || length($in_reply_to) == 0 || - $message_num == 1)) { - $in_reply_to = $message_id; - if (length $references > 0) { - $references .= "\n $message_id"; - } else { - $references = "$message_id"; + if ($thread) { + if ($message_was_sent && + ($chain_reply_to || !defined $in_reply_to || length($in_reply_to) == 0 || + $message_num == 1)) { + $in_reply_to = $message_id; + if (length $references > 0) { + $references .= "\n $message_id"; + } else { + $references = "$message_id"; + } } + } elsif (!defined $initial_in_reply_to) { + # --thread and --in-reply-to manage the "In-Reply-To" header and by + # extension the "References" header. If these commands are not used, reset + # the header values to their defaults. + $in_reply_to = undef; + $references = ''; } $message_id = undef; $num_sent++; diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 3b7540050c..f95177af39 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -2167,6 +2167,51 @@ test_expect_success $PREREQ 'leading and trailing whitespaces are removed' ' test_cmp expected-list actual-list ' +test_expect_success $PREREQ 'set up in-reply-to/references patches' ' + cat >has-reply.patch <<-\EOF && + From: A U Thor + Subject: patch with in-reply-to + Message-ID: + In-Reply-To: + References: + + This is the body. + EOF + cat >no-reply.patch <<-\EOF + From: A U Thor + Subject: patch without in-reply-to + Message-ID: + + 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: " msgtxt1 && + grep "References: " 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="" \ + --to=nobody@example.com \ + --smtp-server="$(pwd)/fake.sendmail" \ + has-reply.patch no-reply.patch && + grep "In-Reply-To: " msgtxt1 && + grep "References: " msgtxt1 && + grep "In-Reply-To: " msgtxt2 && + grep "References: " msgtxt2 +' + test_expect_success $PREREQ 'invoke hook' ' mkdir -p .git/hooks && -- 2.31.1