From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752996AbbF3WH6 (ORCPT ); Tue, 30 Jun 2015 18:07:58 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:53362 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752425AbbF3WHu (ORCPT ); Tue, 30 Jun 2015 18:07:50 -0400 From: Felipe Balbi To: Andy Whitcroft , Joe Perches CC: Linux Kernel Mailing List , Felipe Balbi Subject: [PATCH] scripts: checkpatch: ignore stable commit annotation Date: Tue, 30 Jun 2015 17:07:43 -0500 Message-ID: <1435702063-12871-1-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.4.4 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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> (\"\")' - ie: '${init_char}ommit $id (\"$description\")'\n" . $herecurr); } -- 2.4.4