diff options
| author | Wei Wang <wvw@google.com> | 2017-05-08 18:55:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-08 20:15:11 -0400 |
| commit | e882dbfc248cf28d6afd6fc6d8db8be58a824158 (patch) | |
| tree | ac4a2c3a11344d7ca982e84a9f566fa9c2c847ca /scripts | |
| parent | e4b7d3091def85336d838e38dea91be37bd4d1f5 (diff) | |
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.
Link: http://lkml.kernel.org/r/20170411191532.74381-1-wvw@google.com
Signed-off-by: Wei Wang <wvw@google.com>
Acked-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 3e2d9b0fe5a5..b1befa2cec26 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
| @@ -2539,6 +2539,7 @@ sub process { | |||
| 2539 | # Check for git id commit length and improperly formed commit descriptions | 2539 | # Check for git id commit length and improperly formed commit descriptions |
| 2540 | if ($in_commit_log && !$commit_log_possible_stack_dump && | 2540 | if ($in_commit_log && !$commit_log_possible_stack_dump && |
| 2541 | $line !~ /^\s*(?:Link|Patchwork|http|https|BugLink):/i && | 2541 | $line !~ /^\s*(?:Link|Patchwork|http|https|BugLink):/i && |
| 2542 | $line !~ /^This reverts commit [0-9a-f]{7,40}/ && | ||
| 2542 | ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i || | 2543 | ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i || |
| 2543 | ($line =~ /(?:\s|^)[0-9a-f]{12,40}(?:[\s"'\(\[]|$)/i && | 2544 | ($line =~ /(?:\s|^)[0-9a-f]{12,40}(?:[\s"'\(\[]|$)/i && |
| 2544 | $line !~ /[\<\[][0-9a-f]{12,40}[\>\]]/i && | 2545 | $line !~ /[\<\[][0-9a-f]{12,40}[\>\]]/i && |