OSDN Git Service

UPSTREAM: checkpatch: special audit for revert commit line
authorWei Wang <wvw@google.com>
Fri, 7 Apr 2017 22:22:19 +0000 (15:22 -0700)
committerTodd Poynor <toddpoynor@google.com>
Tue, 11 Apr 2017 20:49:43 +0000 (20:49 +0000)
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 <wvw@google.com>
Acked-by: Joe Perches <joe@perches.com>
Bug: 37158168
Test: checkpatch.pl --patch [diff] and no longer see failure
Change-Id: I65cf9a46874621dd6d5c349d2d3ca3b862d61ba3

scripts/checkpatch.pl

index 2b3c228..e701477 100755 (executable)
@@ -2348,6 +2348,7 @@ sub process {
 
 # Check for git id commit length and improperly formed commit descriptions
                if ($in_commit_log && !$commit_log_possible_stack_dump &&
+                   $line !~ /^This reverts commit [0-9a-f]{7,40}/ &&
                    ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i ||
                     ($line =~ /\b[0-9a-f]{12,40}\b/i &&
                      $line !~ /[\<\[][0-9a-f]{12,40}[\>\]]/i &&