checkpatch: make sure a commit reference description uses parentheses
The preferred style for a commit reference in a commit log is: commit <foo> ("<title line>") A recent commit removed this check for parentheses. Add it back. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
d2e025f364
Коммит
19c146a64c
|
@ -2191,6 +2191,7 @@ sub process {
|
|||
my $case = 1;
|
||||
my $space = 1;
|
||||
my $hasdesc = 0;
|
||||
my $hasparens = 0;
|
||||
my $id = '0123456789ab';
|
||||
my $orig_desc = "commit description";
|
||||
my $description = "";
|
||||
|
@ -2201,10 +2202,12 @@ sub process {
|
|||
$case = 0 if ($line =~ /\b[Cc]ommit\s+[0-9a-f]{5,40}[^A-F]/);
|
||||
if ($line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("([^"]+)"\)/i) {
|
||||
$orig_desc = $1;
|
||||
$hasparens = 1;
|
||||
} elsif ($line =~ /\bcommit\s+[0-9a-f]{5,}\s*$/i &&
|
||||
defined $rawlines[$linenr] &&
|
||||
$rawlines[$linenr] =~ /^\s*\("([^"]+)"\)/) {
|
||||
$orig_desc = $1;
|
||||
$hasparens = 1;
|
||||
} elsif ($line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("[^"]+$/i &&
|
||||
defined $rawlines[$linenr] &&
|
||||
$rawlines[$linenr] =~ /^\s*[^"]+"\)/) {
|
||||
|
@ -2212,12 +2215,13 @@ sub process {
|
|||
$orig_desc = $1;
|
||||
$rawlines[$linenr] =~ /^\s*([^"]+)"\)/;
|
||||
$orig_desc .= " " . $1;
|
||||
$hasparens = 1;
|
||||
}
|
||||
|
||||
($id, $description) = git_commit_info($orig_commit,
|
||||
$id, $orig_desc);
|
||||
|
||||
if ($short || $long || $space || $case || ($orig_desc ne $description)) {
|
||||
if ($short || $long || $space || $case || ($orig_desc ne $description) || !$hasparens) {
|
||||
ERROR("GIT_COMMIT_ID",
|
||||
"Please use git commit description style 'commit <12+ chars of sha1> (\"<title line>\")' - ie: '${init_char}ommit $id (\"$description\")'\n" . $herecurr);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче