lkml.org 
[lkml]   [2015]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] scripts: checkpatch: ignore stable commit annotation
Date
When running scripts/checkpatch.pl on stable commits,
we always get the error for not using 12-character
commit hash abbreviation with shortlog within ("").

Because that's actually a false positive, let's ignore
stable commit annotation.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
scripts/checkpatch.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 90e1edc8dd42..2ad0ef46ad08 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2320,6 +2320,7 @@ sub process {
if ($in_commit_log && $line =~ /\b(c)ommit\s+([0-9a-f]{5,})/i) {
my $init_char = $1;
my $orig_commit = lc($2);
+ my $stable = 0;
my $short = 1;
my $long = 0;
my $case = 1;
@@ -2330,6 +2331,7 @@ sub process {
my $orig_desc = "commit description";
my $description = "";

+ $stable = 1 if ($line =~ /\bcommit\s+[0-9a-f]{40}\s+upstream\./i);
$short = 0 if ($line =~ /\bcommit\s+[0-9a-f]{12,40}/i);
$long = 1 if ($line =~ /\bcommit\s+[0-9a-f]{41,}/i);
$space = 0 if ($line =~ /\bcommit [0-9a-f]/i);
@@ -2355,7 +2357,7 @@ sub process {
($id, $description) = git_commit_info($orig_commit,
$id, $orig_desc);

- if ($short || $long || $space || $case || ($orig_desc ne $description) || !$hasparens) {
+ if (!$stable && ($short || $long || $space || $case || ($orig_desc ne $description) || !$hasparens)) {
ERROR("GIT_COMMIT_ID",
"Please use git commit description style 'commit <12+ chars of sha1> (\"<title line>\")' - ie: '${init_char}ommit $id (\"$description\")'\n" . $herecurr);
}
--
2.4.4


\
 
 \ /
  Last update: 2015-07-01 00:21    [W:0.061 / U:0.960 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site