diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2014-09-15 16:28:16 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-09-15 16:28:16 -0700 |
| commit | 7622d4905a038961da6b1c6c3fe4be6c3dad7ef9 (patch) | |
| tree | cce9f4bc0ef2de31cee8e06e2cd6358dd51fa9c5 /scripts/checkpatch.pl | |
| parent | 5b49ab3e03f68eb49db4bce6290e5707b7f6c6f3 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
| download | linux-7622d4905a038961da6b1c6c3fe4be6c3dad7ef9.tar.gz linux-7622d4905a038961da6b1c6c3fe4be6c3dad7ef9.tar.bz2 linux-7622d4905a038961da6b1c6c3fe4be6c3dad7ef9.zip | |
Merge tag 'v3.17-rc5' from upstream
Diffstat (limited to 'scripts/checkpatch.pl')
| -rwxr-xr-x | scripts/checkpatch.pl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 31a731e06f50..4d08b398411f 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2133,7 +2133,10 @@ sub process { # Check for improperly formed commit descriptions if ($in_commit_log && $line =~ /\bcommit\s+[0-9a-f]{5,}/i && - $line !~ /\b[Cc]ommit [0-9a-f]{12,16} \("/) { + !($line =~ /\b[Cc]ommit [0-9a-f]{12,40} \("/ || + ($line =~ /\b[Cc]ommit [0-9a-f]{12,40}\s*$/ && + defined $rawlines[$linenr] && + $rawlines[$linenr] =~ /^\s*\("/))) { $line =~ /\b(c)ommit\s+([0-9a-f]{5,})/i; my $init_char = $1; my $orig_commit = lc($2); @@ -2141,7 +2144,7 @@ sub process { my $desc = 'commit description'; ($id, $desc) = git_commit_info($orig_commit, $id, $desc); ERROR("GIT_COMMIT_ID", - "Please use 12 to 16 chars for the git commit ID like: '${init_char}ommit $id (\"$desc\")'\n" . $herecurr); + "Please use 12 or more chars for the git commit ID like: '${init_char}ommit $id (\"$desc\")'\n" . $herecurr); } # Check for added, moved or deleted files |