| Message ID | cmhc6xudksabuza2jrhgs5yg2a2xbohadyyazitg6463uskhjp@enclcjvmbx4r |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9194298vqr;
Wed, 28 Jun 2023 13:37:03 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ71x8O6KL1/8mC6m1RG8gs8AUmyK16aUJw4SxQFLHhMnobkjYtX55/ohEtHHyYtWsWpB32I
X-Received: by 2002:a05:6a00:d8b:b0:681:9fe0:b543 with SMTP id
bf11-20020a056a000d8b00b006819fe0b543mr1010758pfb.2.1687984623208;
Wed, 28 Jun 2023 13:37:03 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1687984623; cv=none;
d=google.com; s=arc-20160816;
b=Plq+hPLL/cSJ/UY3A/ZlS8Ow7DoxMshGg4ioxLT272au1kOqSL5GlwEyVC+l690xKJ
CVYXUDuYZODfXMG5lCXHPBtutdZJYXEzLvm8rrh1TgNX7ATI4jSbRy4QzA/NVdH1iV91
XA4ungzK796GHIMpBbPx8sBf/FvqKYNd2LL5g3TjZacqFEZE+PrBsgFsdjWgg3V3NpAv
iG9sfGT5GiswGLhNcHEyFQCb7TFkj1NRO4QN69Zx7PCAmCjirmC10galnzu1j1YKyr+M
artsg1Qdi5j89vXdHq/gI+6kbgoC1QWKT3LlliF7Sb41PdeYGzeEATyxjIUwhQquaYXn
HB9A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:to:user-agent:content-disposition:mime-version
:message-id:subject:cc:from:date:dkim-signature;
bh=E5UVYvtcEmiJRj3u4lSH6UZzysB8TgNa6u2xKKhmZcs=;
fh=QVxo2ObgfsiVuvJWmZPugXHJRPYKCWtM1Zw/9d2D0P0=;
b=O4jqvDICQLqoeFNbCFgP+xe+1Y0aBiMzXvJaHV7YTuwJtDkuoQnM7k5QQD89jrrXiw
rBRh2u50eU3wWnMWh3ngeU7zckkFrF15lMCF39CGGOm9ml1DueXay+pC0CyHr90Rl1h+
6N3rCpX7Db4GV+4UNvbA9yGoDW5t4Lk2HAuUEoRpgySb+pPslfCZDXpUPoSkbRfiNarf
Drt4DlDurUnvttCtGL3GTWE7oZIUx1tLHMNHoh4cPWpYrgs7/8vKFeRwtPZqSO5IDo0U
gEXwJS9+RFSREds127SndeLWgYGLoFD+dx3ZPq6YXxraZneV4JhNjtPAY33MYqykjyuh
1/gw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@nabijaczleweli.xyz header.s=202305
header.b=aJVKFu+U;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nabijaczleweli.xyz
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
cu1-20020a056a00448100b0067b2f265d2asi4761850pfb.262.2023.06.28.13.36.50;
Wed, 28 Jun 2023 13:37:03 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@nabijaczleweli.xyz header.s=202305
header.b=aJVKFu+U;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nabijaczleweli.xyz
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230449AbjF1UfX (ORCPT <rfc822;ivan.orlov0322@gmail.com>
+ 99 others); Wed, 28 Jun 2023 16:35:23 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36980 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229620AbjF1UfV (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 28 Jun 2023 16:35:21 -0400
Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42])
by lindbergh.monkeyblade.net (Postfix) with ESMTP id AB30D1FC2
for <linux-kernel@vger.kernel.org>;
Wed, 28 Jun 2023 13:35:19 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz;
s=202305; t=1687984518;
bh=dn71ai0Ke54aOHw2jYDnLVqkVoyPtJRVPjZChFWAozI=;
h=Date:From:Cc:Subject:From;
b=aJVKFu+UTmno2hzADcVUw+OEj7muptJeUv4/K6ywvLu6uPE/BDkVrmUbo1f/vgQ/C
RPi9lJDjHwRKM/axScOrmq/bIRfZu3RJt3eZD4k4CjbNyRIAIS0fiTCtNoaKjEFwf9
hG62OPFwnBsb2rOdHwMv2qShEYbcSJKpt6s2Vyl6GgIpgIqy/hkovjmhkeIVSK/Y9g
leTYDMc28uW0vVhP2UtjqQJ1Ihwp7aTp+HvaVgNvJTlzuZTf+O5lmkWqDU5Dl2Hr2T
DTDF7By8/YwXb1E4aKJ+mRhv4VG2fQvEIKOZRejAwmsS+t+olu412bVO2Jiaxy0Phx
R+/PrDZP989Wg==
Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250])
by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id C58B01174;
Wed, 28 Jun 2023 22:35:18 +0200 (CEST)
Date: Wed, 28 Jun 2023 22:35:17 +0200
From: Ahelenia =?utf-8?q?Ziemia=C5=84ska?= <nabijaczleweli@nabijaczleweli.xyz>
Cc: Andy Whitcroft <apw@canonical.com>, Joe Perches <joe@perches.com>,
Dwaipayan Ray <dwaipayanray1@gmail.com>,
Lukas Bulwahn <lukas.bulwahn@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] checkpatch: don't take signature to be part of the commit SHA
Message-ID: <cmhc6xudksabuza2jrhgs5yg2a2xbohadyyazitg6463uskhjp@enclcjvmbx4r>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
protocol="application/pgp-signature"; boundary="vr7ohxlsyreiktpc"
Content-Disposition: inline
User-Agent: NeoMutt/20230517
X-Spam-Status: No, score=-0.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MISSING_HEADERS,
PDS_RDNS_DYNAMIC_FP,RDNS_DYNAMIC,SPF_HELO_PASS,SPF_PASS,
T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no
version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
To: unlisted-recipients:; (no To-header on input)
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1769980164276527513?=
X-GMAIL-MSGID: =?utf-8?q?1769980164276527513?=
|
| Series |
checkpatch: don't take signature to be part of the commit SHA
|
|
Commit Message
Ahelenia Ziemiańska
June 28, 2023, 8:35 p.m. UTC
I had just received:
$ scripts/checkpatch.pl 0001-splice-always-fsnotify_access-in-fsnotify_modify-out.patch
WARNING: Please use correct Fixes: style 'Fixes: <12 chars of sha1> ("<title line>")' - ie: 'Fixes: gpg: Signatu (":35 CEST")'
#25:
Fixes: 983652c69199 ("splice: report related fsnotify events")
total: 0 errors, 1 warnings, 60 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
0001-splice-always-fsnotify_access-in-fsnotify_modify-out.patch has style problems, please review.
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
This fails when the Fixes:ed SHAs are signed, since the output is
$ git log --format='%H %s'
gpg: Signature made Wed 28 Jun 2023 19:05:02 CEST
gpg: using RSA key 7D69474E84028C5CC0C44163BCFD0B018D2658F1
gpg: Good signature from "наб <nabijaczleweli@nabijaczleweli.xyz>" [ultimate]
gpg: aka "наб <nabijaczleweli@gmail.com>" [ultimate]
gpg: aka "nabijaczleweli <nabijaczleweli@gmail.com>" [ultimate]
53307062b2b644dc0de7bde916d6193492f37643 splice: fsnotify_access(in), fsnotify_modify(out) on success in tee
or
$ git log --format='%H %s' 983652c69199
gpg: Signature made Tue 04 Apr 2023 15:57:35 CEST
gpg: using EDDSA key 408734571EA70C78B332692891C61BC06578DCA2
gpg: Can't check signature: No public key
983652c691990b3257a07f67f4263eb847baa82d splice: report related fsnotify events
The fix mimicks what was done in commit f24fb53984cf ("perf tools: Don't
include signature in version strings"): just don't ask for the
signatures being validated.
With this, my patch passed validation.
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
---
Grepped through for /log /, /show /, and /git_command/, and this
is all I found. Unsure if there's other git executions that need
to be fixed, tho.
scripts/checkpatch.pl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Comments
On Wed, 2023-06-28 at 22:35 +0200, Ahelenia Ziemiańska wrote: > I had just received: > $ scripts/checkpatch.pl 0001-splice-always-fsnotify_access-in-fsnotify_modify-out.patch > WARNING: Please use correct Fixes: style 'Fixes: <12 chars of sha1> ("<title line>")' - ie: 'Fixes: gpg: Signatu (":35 CEST")' > #25: > Fixes: 983652c69199 ("splice: report related fsnotify events") > > total: 0 errors, 1 warnings, 60 lines checked > > NOTE: For some of the reported defects, checkpatch may be able to > mechanically convert to the typical style using --fix or --fix-inplace. > > 0001-splice-always-fsnotify_access-in-fsnotify_modify-out.patch has style problems, please review. > > NOTE: If any of the errors are false positives, please report > them to the maintainer, see CHECKPATCH in MAINTAINERS. > > This fails when the Fixes:ed SHAs are signed, since the output is > $ git log --format='%H %s' > gpg: Signature made Wed 28 Jun 2023 19:05:02 CEST > gpg: using RSA key 7D69474E84028C5CC0C44163BCFD0B018D2658F1 > gpg: Good signature from "наб <nabijaczleweli@nabijaczleweli.xyz>" [ultimate] > gpg: aka "наб <nabijaczleweli@gmail.com>" [ultimate] > gpg: aka "nabijaczleweli <nabijaczleweli@gmail.com>" [ultimate] > 53307062b2b644dc0de7bde916d6193492f37643 splice: fsnotify_access(in), fsnotify_modify(out) on success in tee > or > $ git log --format='%H %s' 983652c69199 > gpg: Signature made Tue 04 Apr 2023 15:57:35 CEST > gpg: using EDDSA key 408734571EA70C78B332692891C61BC06578DCA2 > gpg: Can't check signature: No public key > 983652c691990b3257a07f67f4263eb847baa82d splice: report related fsnotify events > > The fix mimicks what was done in commit f24fb53984cf ("perf tools: Don't mimics > include signature in version strings"): just don't ask for the > signatures being validated. > > With this, my patch passed validation. > > Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> > --- > Grepped through for /log /, /show /, and /git_command/, and this > is all I found. Unsure if there's other git executions that need > to be fixed, tho. Not sure either but perhaps these should be in some negative options variable like: my $git_log_no = "--no-show-signature --no-merges --no-color"; > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl [] > @@ -1164,7 +1164,7 @@ sub seed_camelcase_includes { > $camelcase_seeded = 1; > > if (-e "$gitroot") { > - my $git_last_include_commit = `${git_command} log --no-merges --pretty=format:"%h%n" -1 -- include`; > + my $git_last_include_commit = `${git_command} log --no-show-signature --no-merges --pretty=format:"%h%n" -1 -- include`; my $git_last_include_commit = `${git_command} log ${git_log_no} --pretty=... etc...
On Wed, Jun 28, 2023 at 09:11:00PM -0700, Joe Perches wrote: > On Wed, 2023-06-28 at 22:35 +0200, Ahelenia Ziemiańska wrote: > > Grepped through for /log /, /show /, and /git_command/, and this > > is all I found. Unsure if there's other git executions that need > > to be fixed, tho. > Not sure either but perhaps these should be in some > negative options variable like: > > my $git_log_no = "--no-show-signature --no-merges --no-color"; > > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > [] > > @@ -1164,7 +1164,7 @@ sub seed_camelcase_includes { > > $camelcase_seeded = 1; > > > > if (-e "$gitroot") { > > - my $git_last_include_commit = `${git_command} log --no-merges --pretty=format:"%h%n" -1 -- include`; > > + my $git_last_include_commit = `${git_command} log --no-show-signature --no-merges --pretty=format:"%h%n" -1 -- include`; > my $git_last_include_commit = `${git_command} log ${git_log_no} --pretty=... git_commit_info doesn't use --no-merges, and so that'd change the behaviour of "fixes: xxx"/"commit xxx" thusly: $ git log --no-show-signature --no-color --format="%H %s" -1 e3b2e2c14bcc12da2c463a7179db39139f682573 e3b2e2c14bcc12da2c463a7179db39139f682573 Merge tag 'i2c-for-6.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux $ git log --no-show-signature --no-merges --no-color --format="%H %s" -1 e3b2e2c14bcc12da2c463a7179db39139f682573 afa4bb778e48d79e4a642ed41e3b4e0de7489a6c workqueue: clean up WORK_* constant types, clarify masking (flattening a referenced merge to its first parent). Just confirming that's what we want, because I wouldn't think it is?
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index b30114d637c4..d3a682bc9c20 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1164,7 +1164,7 @@ sub seed_camelcase_includes { $camelcase_seeded = 1; if (-e "$gitroot") { - my $git_last_include_commit = `${git_command} log --no-merges --pretty=format:"%h%n" -1 -- include`; + my $git_last_include_commit = `${git_command} log --no-show-signature --no-merges --pretty=format:"%h%n" -1 -- include`; chomp $git_last_include_commit; $camelcase_cache = ".checkpatch-camelcase.git.$git_last_include_commit"; } else { @@ -1226,7 +1226,7 @@ sub git_commit_info { return ($id, $desc) if ((which("git") eq "") || !(-e "$gitroot")); - my $output = `${git_command} log --no-color --format='%H %s' -1 $commit 2>&1`; + my $output = `${git_command} log --no-show-signature --no-color --format='%H %s' -1 $commit 2>&1`; $output =~ s/^\s*//gm; my @lines = split("\n", $output); @@ -1277,7 +1277,7 @@ if ($git) { } else { $git_range = "-1 $commit_expr"; } - my $lines = `${git_command} log --no-color --no-merges --pretty=format:'%H %s' $git_range`; + my $lines = `${git_command} log --no-show-signature --no-color --no-merges --pretty=format:'%H %s' $git_range`; foreach my $line (split(/\n/, $lines)) { $line =~ /^([0-9a-fA-F]{40,40}) (.*)$/; next if (!defined($1) || !defined($2));