From patchwork Mon Jul 3 14:51:57 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: 115416 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp601854vqx; Mon, 3 Jul 2023 08:24:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6nVMRyE376GyWPHD09+tUhwaNwl8Iq9kuK8/QEzo//AHvGBEmhCmL08J3akcKZVS13wY/5 X-Received: by 2002:a05:6a20:3d1a:b0:100:b92b:e8be with SMTP id y26-20020a056a203d1a00b00100b92be8bemr16407879pzi.2.1688397893817; Mon, 03 Jul 2023 08:24:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688397893; cv=none; d=google.com; s=arc-20160816; b=B6NSlddZdUx0y05+epAVWE07gTgfgEpB7s9VSyLkv5xwTdxnHj7cwXTcCIFaR3uVkx TB7mGYIQGRhqnNQm0jG5w071tCmbS72uKRnbT72sSf6UcFyzjd2kYo+yzpS8pW1KmhiS NCQCkJgtyT35+MMvQ8mgOfV6XN6oxzi1M+wmndN3YOqfiTb6C9lMXGf5/XJQzreXQ5CD mhzTUDjyUZiBm5WqSYUSoaJMw8LZ7Qd1TVIPkYb3gnwWxNCVvxMjgXXWluXdA8vBvy4C mz0J6MtO9UdvNvGp0adV6MKQso6ZhIuEPHFfdY1BZAHR6XoRkK4APL5RhXgtPMQizgrB sLNw== 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=sfWno+Yur6BC1TgSDennmlYEuiPancshSOLIi+vLscU=; fh=QVxo2ObgfsiVuvJWmZPugXHJRPYKCWtM1Zw/9d2D0P0=; b=q+5+A4cOIZ+kLyOuaaHjZZf96t2usRqMcL+p+ff4XPsS0ckv1+Xo1nHRUXdcAOUUtH 5DpeK5L9gPw0Ygx/pp58uyOTa9N61daiIsVxvvHKPKqS4UU123qoIPrX3DdjmPu4tW+C cOGFtmIhVK8b8rTc8lmng1spYTNjtmutgG1TiqgnIpJEKfEB5xp33lrm2uXTRmAhtkKV 30hu7brIpY2UG5B8IZJtztmW5G63Bi7F5xIPQbNBRV9CGW3mzZcP8ZFRetSA4bS/9C9U WsRYOURa5+eBFRjAmG3RMgbEZxwm6VtuC1xRmRPKmcuyUa53vBbokvJy/Bp8MgPWG3sw 6/Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nabijaczleweli.xyz header.s=202305 header.b="qe/bkuHb"; 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 w4-20020a656944000000b0055b0f40083csi12443952pgq.639.2023.07.03.08.24.41; Mon, 03 Jul 2023 08:24:53 -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="qe/bkuHb"; 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 S229930AbjGCOwC (ORCPT + 99 others); Mon, 3 Jul 2023 10:52:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbjGCOwA (ORCPT ); Mon, 3 Jul 2023 10:52:00 -0400 Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A49CD10E for ; Mon, 3 Jul 2023 07:51:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202305; t=1688395919; bh=9Fz8rU9GmTaxOPVMlac3r3BzwGUKuWGirTJMgrIhhp8=; h=Date:From:Cc:Subject:References:In-Reply-To:From; b=qe/bkuHbreHbm5lBsGJY6UMo8PLqxKWw24r3kGoS+9hbmR4YdVV5A5FiyxQ0RLIcp /CpJt41YsBnTutOg8qjuQYm8VZLqSExsw/4Weaw/M8oYI6hkfDwoKqCm6Sb/3R+trg Ags6bFTETucJ4Avf+EJTXWHMX5zswzUHg/O2s0soV2BOVd/6jD/N3gq59mca8awwnt 07QWbBJDjhnW3bFwqUwF4UgNRqsbbWnkkHh3AY/2JTKlUTdORkIhJg0+lXJhMmk9i7 HSpGy5vN/0Bf+Y+6WPFtivA3ZC9X3o5Etj0lAtmcx/qUD/0jWggRQazbzkQP4Rcpu8 u/c6d/sGb6FFg== Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id E89E51EBA; Mon, 3 Jul 2023 16:51:58 +0200 (CEST) Date: Mon, 3 Jul 2023 16:51:57 +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 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, PDS_RDNS_DYNAMIC_FP,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769980164276527513?= X-GMAIL-MSGID: =?utf-8?q?1770413509908670366?= 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> --- 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 = "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));