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;
Date:   Mon, 3 Jul 2023 16:51:57 +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 v2] checkpatch: don't take signature to be part of the commit
 SHA
Message-ID: <yobkleyyfic3cxlslgwft7eomzc4k2e4r6goy2x3xhbnzvee46@2u4treiamxdy>
References: <p6by5totn26ofijoki4v6a7lgciswfqovyfrmavtldxg63g2k5@bp3uxxbccxvr>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="3hdjimvrirjnjqby"
Content-Disposition: inline
In-Reply-To: <p6by5totn26ofijoki4v6a7lgciswfqovyfrmavtldxg63g2k5@bp3uxxbccxvr>
User-Agent: NeoMutt/20230517
To:     unlisted-recipients:; (no To-header on input)
Precedence: bulk


--3hdjimvrirjnjqby
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

I had just received:
  $ scripts/checkpatch.pl 0001-splice-always-fsnotify_access-in-fsnotify_mo=
dify-out.patch
  WARNING: Please use correct Fixes: style 'Fixes: <12 chars of sha1> ("<ti=
tle 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-inpl=
ace.

  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=3D'%H %s'
  gpg: Signature made Wed 28 Jun 2023 19:05:02 CEST
  gpg:                using RSA key 7D69474E84028C5CC0C44163BCFD0B018D2658F1
  gpg: Good signature from "=D0=BD=D0=B0=D0=B1 <nabijaczleweli@nabijaczlewe=
li.xyz>" [ultimate]
  gpg:                 aka "=D0=BD=D0=B0=D0=B1 <nabijaczleweli@gmail.com>" =
[ultimate]
  gpg:                 aka "nabijaczleweli <nabijaczleweli@gmail.com>" [ult=
imate]
  53307062b2b644dc0de7bde916d6193492f37643 splice: fsnotify_access(in), fsn=
otify_modify(out) on success in tee
or
  $ git log --format=3D'%H %s' 983652c69199
  gpg: Signature made Tue 04 Apr 2023 15:57:35 CEST
  gpg:                using EDDSA key 408734571EA70C78B332692891C61BC06578D=
CA2
  gpg: Can't check signature: No public key
  983652c691990b3257a07f67f4263eb847baa82d splice: report related fsnotify =
events

The fix mimics 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=C5=84ska <nabijaczleweli@nabijaczleweli.xyz>
---
 scripts/checkpatch.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b30114d637c4..1ff2c9835245 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -71,6 +71,7 @@ my $color =3D "auto";
 my $allow_c99_comments =3D 1; # Can be overridden by --ignore C99_COMMENT_=
TOLERANCE
 # git output parsing needs US English output, so first set backtick child =
process LANGUAGE
 my $git_command =3D'export LANGUAGE=3Den_US.UTF-8; git';
+my $git_log_no =3D "--no-show-signature --no-color";
 my $tabsize =3D 8;
 my ${CONFIG_} =3D "CONFIG_";
=20
@@ -1164,7 +1165,7 @@ sub seed_camelcase_includes {
 	$camelcase_seeded =3D 1;
=20
 	if (-e "$gitroot") {
-		my $git_last_include_commit =3D `${git_command} log --no-merges --pretty=
=3Dformat:"%h%n" -1 -- include`;
+		my $git_last_include_commit =3D `${git_command} log ${git_log_no} --no-m=
erges --pretty=3Dformat:"%h%n" -1 -- include`;
 		chomp $git_last_include_commit;
 		$camelcase_cache =3D ".checkpatch-camelcase.git.$git_last_include_commit=
";
 	} else {
@@ -1226,7 +1227,7 @@ sub git_commit_info {
=20
 	return ($id, $desc) if ((which("git") eq "") || !(-e "$gitroot"));
=20
-	my $output =3D `${git_command} log --no-color --format=3D'%H %s' -1 $comm=
it 2>&1`;
+	my $output =3D `${git_command} log ${git_log_no} --format=3D'%H %s' -1 $c=
ommit 2>&1`;
 	$output =3D~ s/^\s*//gm;
 	my @lines =3D split("\n", $output);
=20
@@ -1277,7 +1278,7 @@ if ($git) {
 		} else {
 			$git_range =3D "-1 $commit_expr";
 		}
-		my $lines =3D `${git_command} log --no-color --no-merges --pretty=3Dform=
at:'%H %s' $git_range`;
+		my $lines =3D `${git_command} log ${git_log_no} --no-merges --pretty=3Df=
ormat:'%H %s' $git_range`;
 		foreach my $line (split(/\n/, $lines)) {
 			$line =3D~ /^([0-9a-fA-F]{40,40}) (.*)$/;
 			next if (!defined($1) || !defined($2));
--=20
2.39.2

--3hdjimvrirjnjqby
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmSi4I0ACgkQvP0LAY0m
WPFCnxAAoyoVHV4TC1a9oR3O/QR36FVHOFHFLPOepDaWKS00oMXGGWP82MzKohUj
fvsDabeIxlfjwRrVpRlMrqmJog0+gHUoTr2ppIPRy2PDz3LZXBn2yZP+Zh51lgdz
TThGdwnwR6q0lCjIxBYTsfjupj+uU+37hp7Zo19H6Ejrb7Uf8U4gCHu1fI+Zg7MV
DORdKDiS7eSMsW7k2Hsv0MoVqfgMpyROWc7txHJdq3KVWetuB8AuNv9pCr5bVZpY
avcK9CqqgUuVoIyRqVqL3i6b55hS/y5A5Xo4MHgjQ2x25H5xcbBtEI7MeCLEIe1n
OC0+13LVOsPhPN+HbVqDEZidzilj0wDQ029K6ZXRuWjC2t9fMQfyXPWSDlZ+QV6k
K74mHNTNTNg2tVMWXcpzOe3HyPKYyvbzAdcU+Oqa/Oytrkdo3fPnLj+6Bs8yW+nh
xVpN8kYx7Ug3cNUX2f4DNYLUBnNzOGbBDm40kQQ4fQnSxvq82AqzajDuSYik014b
HXNZSd+bNt3rNZa+rpPR+/6Vm87qjcFqVm/NHJQlXgn7pdIlMGR+42i1X38/aem1
8OxJcB15owMhTxbYe1fEByA5sC2+hN+6vY1Oz6wraYyip3j/oxk5PH3mH1b2epG1
gVgAOCxEyc6AD0Gdbde9id+Z9EI3yAVlFI+y5XDMjirVok7T9mU=
=IU9O
-----END PGP SIGNATURE-----

--3hdjimvrirjnjqby--