public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH RFC] checkpatch: extend unknown commit id check for multiple lines
@ 2021-06-20 17:08 Dwaipayan Ray
  0 siblings, 0 replies; only message in thread
From: Dwaipayan Ray @ 2021-06-20 17:08 UTC (permalink / raw)
  To: joe; +Cc: lukas.bulwahn, linux-kernel, Dwaipayan Ray

The check for unknown commit id cannot process commit references
split across multiple lines such as:

... via commit
3945ff37d2f4 ("linux/bits.h: Extract common header for vDSO").

Extend the check to handle the above.

Signed-off-by: Dwaipayan Ray <dwaipayanray1@gmail.com>
---
 scripts/checkpatch.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 0eb73e59e0b5..8d19beca3538 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3335,13 +3335,16 @@ sub process {
 		}
 
 # check for invalid commit id
-		if ($in_commit_log && $line =~ /(^fixes:|\bcommit)\s+([0-9a-f]{6,40})\b/i) {
+		if ($in_commit_log &&
+		    ($line =~ /(?:^fixes:|\bcommit)\s+([0-9a-f]{6,40})\b/i ||
+		     ($lines[$linenr - 2] =~ /\bcommit\s*$/i &&
+		      $line =~ /^\s*([0-9a-f]{6,40})\b/i))) {
 			my $id;
 			my $description;
-			($id, $description) = git_commit_info($2, undef, undef);
+			($id, $description) = git_commit_info($1, undef, undef);
 			if (!defined($id)) {
 				WARN("UNKNOWN_COMMIT_ID",
-				     "Unknown commit id '$2', maybe rebased or not pulled?\n" . $herecurr);
+				     "Unknown commit id '$1', maybe rebased or not pulled?\n" . $herecurr);
 			}
 		}
 
-- 
2.28.0


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2021-06-20 17:11 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-20 17:08 [PATCH RFC] checkpatch: extend unknown commit id check for multiple lines Dwaipayan Ray

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox