If a git commit description is split on consecutive lines,
coalesce it before testing.
This allows:
commit <foo> ("some long
description")
Signed-off-by: Joe Perches <[email protected]>
Noticed-by: Paul Bolle <[email protected]>
---
> Checkpatch in next-21050119 complains:
> ERROR: Please use git commit description style 'commit <12+ chars of
> sha1> ("<title line>")' - ie: 'commit fa0ce4035d48 ("ARM: 7162/1: errata:
> tidy up Kconfig options for PL310 errata workarounds")'
> #7:
> commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for
>
> total: 1 errors, 0 warnings, 14 lines checked
>
> Your patch has style problems, please review.
>
> Perhaps it doesn't notice the quote spans two lines. Can this be fixed
> please?
Oh bother...
scripts/checkpatch.pl | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 41223c9..6a3baa0 100755
--- 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,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
