From patchwork Mon Nov 6 15:32:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 13447125 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B01B28E07 for ; Mon, 6 Nov 2023 15:32:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=none Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5E9C100 for ; Mon, 6 Nov 2023 07:32:18 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r01aL-0005A6-Dp; Mon, 06 Nov 2023 16:32:17 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1r01aJ-0074kH-1Z; Mon, 06 Nov 2023 16:32:15 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1r01aI-00DmBo-Ob; Mon, 06 Nov 2023 16:32:14 +0100 Date: Mon, 6 Nov 2023 16:32:14 +0100 From: Uwe =?utf-8?q?Kleine-K=C3=B6nig?= To: git@vger.kernel.org Cc: Junio C Hamano , Douglas Anderson , entwicklung@pengutronix.de Subject: Regression: git send-email Message-Id: numbering doesn't start at 1 any more Message-ID: <20231106153214.s5abourejkuiwk64@pengutronix.de> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: git@vger.kernel.org Hello, Since commit 3ece9bf0f9e24909b090cf348d89e8920bd4f82f I experience that the generated Message-Ids don't start at ....-1-... any more. I have: $ git send-email w/* ... Subject: [PATCH 0/5] watchdog: Drop platform_driver_probe() and convert to platform remove callback returning void (part II) Date: Mon, 6 Nov 2023 16:10:04 +0100 Message-ID: <20231106151003.3844134-7-u.kleine-koenig@pengutronix.de> ... So the cover letter is sent with Message-Id: ...-7-... Before above mentioned commit I had: ... Message-ID: <20231106151003.3844134-1-u.kleine-koenig@pengutronix.de> ... Similar to my earlier regression report this also only happens in the presence of a sendemail-validate hook. Passing --no-validate works around this issue. While this isn't an issue for git itself, it breaks one of my scripts that knows how to determine the number of patches in a series from the last Message-Id:. The following patch works for me: But I guess this could be done prettier by someone who is fluent in Perl. Best regards Uwe diff --git a/git-send-email.perl b/git-send-email.perl index 9e21b0b3f43a..095a3d9dd720 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -799,6 +799,7 @@ sub is_format_patch_arg { $time = time - scalar $#files; +my ($message_id_stamp, $message_id_serial); if ($validate) { # FIFOs can only be read once, exclude them from validation. my @real_files = (); @@ -821,6 +822,7 @@ sub is_format_patch_arg { } delete $ENV{GIT_SENDEMAIL_FILE_COUNTER}; delete $ENV{GIT_SENDEMAIL_FILE_TOTAL}; + $message_id_serial = 0; } @files = handle_backup_files(@files); @@ -1181,7 +1183,6 @@ sub validate_address_list { # We'll setup a template for the message id, using the "from" address: -my ($message_id_stamp, $message_id_serial); sub make_message_id { my $uniq; if (!defined $message_id_stamp) {