From 5b10152c522ec0abda8782157b1c3e3018cf8deb Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Fri, 7 Apr 2017 15:22:19 -0700 Subject: [PATCH] UPSTREAM: checkpatch: special audit for revert commit line Currently checkpatch.pl does not recognize git's default commit revert message and will complain about the hash format. Add special audit for revert commit message line to fix it. Signed-off-by: Wei Wang Acked-by: Joe Perches Signed-off-by: Andrew Morton Bug: 37158168 Test: checkpatch.pl --patch [diff] and no longer see failure Change-Id: I65cf9a46874621dd6d5c349d2d3ca3b862d61ba3 --- scripts/checkpatch.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index a8368d1c4348..a1a89b6db0cc 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2529,6 +2529,7 @@ sub process { # Check for git id commit length and improperly formed commit descriptions if ($in_commit_log && !$commit_log_possible_stack_dump && $line !~ /^\s*(?:Link|Patchwork|http|https|BugLink):/i && + $line !~ /^This reverts commit [0-9a-f]{7,40}/ && ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i || ($line =~ /(?:\s|^)[0-9a-f]{12,40}(?:[\s"'\(\[]|$)/i && $line !~ /[\<\[][0-9a-f]{12,40}[\>\]]/i &&