From patchwork Mon Jul 31 12:46:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ahelenia_Ziemia=C5=84ska?= X-Patchwork-Id: 128738 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2045734vqg; Mon, 31 Jul 2023 07:17:17 -0700 (PDT) X-Google-Smtp-Source: APBJJlGb54QpzCO8dhpVtogZCjCkg3vpcecEuL2t9i/9xgQxRS/oob5khM5rq7aGCZ8iOJtjultX X-Received: by 2002:a17:902:d34d:b0:1bc:1014:2a56 with SMTP id l13-20020a170902d34d00b001bc10142a56mr2855693plk.21.1690813036529; Mon, 31 Jul 2023 07:17:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690813036; cv=none; d=google.com; s=arc-20160816; b=iCwJPR6nbVT9V1OUphFbPzL0fUuTbs3IUQ+3Jwuj2Qp4IdPiTbrOBaYoXDrITqb2lU vnyjhWrCpeV29LioEuc2U7+pESFob3VxuXnWS7O30PIuMFWNdG1ADj5Bxk18sq9nJ7zC BlPd7XlO6b7/x5MwhP0MYDDA+BWpr9Q4YiWKBn5irXFtz0ftrUPgiArc63gIQrTYpNRI RT286EMFjGBjDmkWVw9WQT0ujLeJBiYrTBUv6ifSIEyZ3C8KN1LEJ2tKNF5Ara89rbjt uPY/LXwYlqmu7VJOM6QHMzeB0hgD6NOO6J0ov34Q3XDy4BNIVrfJVgLScS2TH9R90coa +pgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:from:date :dkim-signature; bh=Kw1GqrcBVbLFn90ZIl983v4IZbRnQolOvP8sC5KWoC4=; fh=mYNY7QUoTHWHjHVf8T8ftEObdo4YAzKS4ro8PLyswWA=; b=GE5Owh/8qFRSthDEjFyAcvQDDmsuTW8umChsjESRDFFuPMJnqbyYnc3o5jKNZ04T+I WC6b5zO8rlUozGTq93qtdVWJCVpbZh4ywfZweDTgqRa/tswLo1w2X9UPf45c+C5fNuQR rRR4RdO91uyJS/tquOn6C7SBNw6jCwHg/cET3sLJpU8euH+9FTiPAPGygJkew2uaQD6j //bC9MBLEhMd99lLAKePgNQEo6+kVYvYqhlSNQdVxdAS73um7JpduHSIUO+iXGMyXEry Ft3is0+/oVkzQLeJIr/yQEBnN6591+mEurGM26YnGyvufLn64Fgy3IFjGWcu5aQ2YJo2 fAZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nabijaczleweli.xyz header.s=202305 header.b=gDgkZC1S; 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 f13-20020a170902684d00b001bba6128bf5si7221036pln.368.2023.07.31.07.17.02; Mon, 31 Jul 2023 07:17:16 -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=gDgkZC1S; 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 S232924AbjGaMrE (ORCPT + 99 others); Mon, 31 Jul 2023 08:47:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230332AbjGaMqo (ORCPT ); Mon, 31 Jul 2023 08:46:44 -0400 Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E1AD22128 for ; Mon, 31 Jul 2023 05:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202305; t=1690807567; bh=gkt0rIqkUhHlExY4cS774r8mZa6RShIBQ5xwZJifOGA=; h=Date:From:Cc:Subject:References:In-Reply-To:From; b=gDgkZC1SHcBGjwdzSOrh14xZq6Rnem5ixqY9Au3dq9UYcY9Q+rOpTBYXAO+ysuwyI Fna5ExqvxpaKnV8YQ5eVY8ZZHW4KPJX7CfRnin1gvAucCx4grdoS3Gcw+aOPrcnIAR kNgClwbG2rddNifKf355pphKQfbeBdxNLJtLpAuqxANQBh2+ipvLrg+fO3m7QKeFN9 RuR8kZEuzQeIDxtvKcXVhqVphaD0ca7iwfVUTd03e9udOEGz4VhZKLN+w0xNIQ8NtL O6s2x2D0EUsNQV9NLEfmp+qaa+4VrTQkcE4pBA/QTZRbbO1AV5TGrij7rqguN8Dnmr iX/0WxxQmC+3g== Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id 5ECE34C96; Mon, 31 Jul 2023 14:46:07 +0200 (CEST) Date: Mon, 31 Jul 2023 14:46:06 +0200 From: Ahelenia =?utf-8?q?Ziemia=C5=84ska?= Cc: Andy Whitcroft , Joe Perches , Dwaipayan Ray , Lukas Bulwahn , linux-kernel@vger.kernel.org Subject: [PATCH RESEND v2] checkpatch: don't take signature to be part of the commit SHA Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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, RCVD_IN_DNSWL_BLOCKED,RDNS_DYNAMIC,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1769980164276527513 X-GMAIL-MSGID: 1772945970339332750 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> ("")' - 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 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ńska <nabijaczleweli@nabijaczleweli.xyz> --- No-change rebase of v2. scripts/checkpatch.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 880fde13d9b8..734c7d4a4ac7 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -71,6 +71,7 @@ my $color = "auto"; my $allow_c99_comments = 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 ='export LANGUAGE=en_US.UTF-8; git'; +my $git_log_no = "--no-show-signature --no-color"; my $tabsize = 8; my ${CONFIG_} = "CONFIG_"; @@ -1164,7 +1165,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 ${git_log_no} --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 +1227,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 ${git_log_no} --format='%H %s' -1 $commit 2>&1`; $output =~ s/^\s*//gm; my @lines = split("\n", $output); @@ -1277,7 +1278,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 ${git_log_no} --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));