checkpatch: add ability to coalesce commit descriptions on multiple lines

JoePerches · torvalds · commit b671fde0572a · 2015-02-13T21:21:39.000-08:00
If a git commit description is split on consecutive lines, coalesce it
before testing.

This allows:

  commit &lt;foo&gt; ("some long
  description")

Signed-off-by: Joe Perches &lt;joe@perches.com&gt;
Reported-by: Paul Bolle &lt;pebolle@tiscali.nl&gt;
Tested-by: Paul Bolle &lt;pebolle@tiscali.nl&gt;

Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
@@ -2198,6 +2198,13 @@ sub process {
 				 defined $rawlines[$linenr] &&
 				 $rawlines[$linenr] =~ /^\s*\("([^"]+)"\)/) {
 				$orig_desc = $1;
+			} elsif ($line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("[^"]+$/i &&
+				 defined $rawlines[$linenr] &&
+				 $rawlines[$linenr] =~ /^\s*[^"]+"\)/) {
+				$line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("([^"]+)$/i;
+				$orig_desc = $1;
+				$rawlines[$linenr] =~ /^\s*([^"]+)"\)/;
+				$orig_desc .= " " . $1;
 			}
 
 			($id, $description) = git_commit_info($orig_commit,
