Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756696AbcJWUhI (ORCPT ); Sun, 23 Oct 2016 16:37:08 -0400 Received: from smtprelay0027.hostedemail.com ([216.40.44.27]:53299 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751476AbcJWUhF (ORCPT ); Sun, 23 Oct 2016 16:37:05 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 50,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::,RULES_HIT:41:355:379:541:599:800:960:967:973:982:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1543:1593:1594:1605:1711:1730:1747:1777:1792:2393:2525:2560:2563:2682:2685:2828:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3622:3653:3865:3866:3867:3868:3870:3871:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4605:5007:9025:10004:10400:10848:11026:11232:11473:11658:11783:11914:12043:12050:12438:12555:12740:13439:13894:14181:14659:14721:21080:21433:21451:30034:30054:30080:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:2,LUA_SUMMARY:none X-HE-Tag: cats95_34dbb4869554 X-Filterd-Recvd-Size: 4397 Message-ID: <1477255021.3561.9.camel@perches.com> Subject: Re: [PATCH 1/1] checkpatch: remove false warning for commit reference From: Joe Perches To: Heinrich Schuchardt , Andy Whitcroft , Andrew Morton Cc: linux-kernel@vger.kernel.org Date: Sun, 23 Oct 2016 13:37:01 -0700 In-Reply-To: <1477208091-4887-1-git-send-email-xypron.glpk@gmx.de> References: <1465608362-4677-1-git-send-email-xypron.glpk@gmx.de> <1477208091-4887-1-git-send-email-xypron.glpk@gmx.de> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.22.0-2ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3407 Lines: 102 On Sun, 2016-10-23 at 09:34 +0200, Heinrich Schuchardt wrote: > Checkpatch warns of an incorrect commit reference style > for any hexadecimal number of 12 digits and more. > > Numbers of 12 digits are not necessarily commit ids. > > For an example provoking the problem see > https://patchwork.kernel.org/patch/9170897/ > > Checkpatch should only warn if the number refers to an > existing commit. That seems sensible. > Signed-off-by: Heinrich Schuchardt > --- > scripts/checkpatch.pl | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl [] > @@ -848,6 +848,7 @@ sub git_commit_info { > # echo "commit $(cut -c 1-12,41-)" > # done > } elsif ($lines[0] =~ /^fatal: ambiguous argument '$commit': unknown revision or path not in the working tree\./) { > + $id = undef; OK > } else { > $id = substr($lines[0], 0, 12); > $desc = substr($lines[0], 41); > @@ -2577,7 +2578,9 @@ sub process { > ($id, $description) = git_commit_info($orig_commit, > $id, $orig_desc); > > - if ($short || $long || $space || $case || ($orig_desc ne $description) || !$hasparens) { > + if ($id && ($short || $long || $space || $case > + || ($orig_desc ne $description) > + || !$hasparens)) { I'd prefer if (defined($id) && ($short || $long || $space || $case || ($orig_desc ne $description) || !$hasparens)) { and not wrap the tests. Maybe ignore all the cases there git is not installed too. Something like: --- ?scripts/checkpatch.pl | 16 ++++++++++------ ?1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index a8368d1c4348..a46b6ebe067b 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -829,13 +829,16 @@ sub seed_camelcase_includes { ?sub git_commit_info { ? my ($commit, $id, $desc) = @_; ? - return ($id, $desc) if ((which("git") eq "") || !(-e ".git")); + my $git_id = undef; + my $git_desc = undef; + + return ($git_id, $git_desc) if ((which("git") eq "") || !(-e ".git")); ? ? my $output = `git log --no-color --format='%H %s' -1 $commit 2>&1`; ? $output =~ s/^\s*//gm; ? my @lines = split("\n", $output); ? - return ($id, $desc) if ($#lines < 0); + return ($git_id, $git_desc) if ($#lines < 0); ? ? if ($lines[0] =~ /^error: short SHA1 $commit is ambiguous\./) { ?# Maybe one day convert this block of bash into something that returns @@ -849,11 +852,11 @@ sub git_commit_info { ?# done ? } elsif ($lines[0] =~ /^fatal: ambiguous argument '$commit': unknown revision or path not in the working tree\./) { ? } else { - $id = substr($lines[0], 0, 12); - $desc = substr($lines[0], 41); + $git_id = substr($lines[0], 0, 12); + $git_desc = substr($lines[0], 41); ? } ? - return ($id, $desc); + return ($git_id, $git_desc); ?} ? ?$chk_signoff = 0 if ($file); @@ -2577,7 +2580,8 @@ sub process { ? ($id, $description) = git_commit_info($orig_commit, ? ??????$id, $orig_desc); ? - if ($short || $long || $space || $case || ($orig_desc ne $description) || !$hasparens) { + if (defined($id) && + ????($short || $long || $space || $case || ($orig_desc ne $description) || !$hasparens)) { ? ERROR("GIT_COMMIT_ID", ? ??????"Please use git commit description style 'commit <12+ chars of sha1> (\"\")' - ie: '${init_char}ommit $id (\"$description\")'\n" . $herecurr); ? }