checkpatch: ensure we only apply checks to the lines within hunks (30670854) · Commits · 戴 / test

We should only apply source checks to lines within hunks. Checks which are anchored in the context may falsly trigger in the commentory. Ensure they only match within valid hunk lines. Signed-off-by:

Andy Whitcroft <apw@shadowen.org> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

scripts/checkpatch.pl

+3 −2

Original line number	Diff line number	Diff line
		@@ -1128,6 +1128,7 @@ sub process {
		$linenr++;

		my $rawline = $rawlines[$linenr - 1];
		my $hunk_line = ($realcnt != 0);

		#extract the line range in the file after the patch is applied
		if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
		@@ -1238,8 +1239,8 @@ sub process {
		ERROR("Invalid UTF-8, patch and commit message should be encoded in UTF-8\n" . $hereptr);
		}

		#ignore lines being removed
		if ($line=~/^-/) {next;}
		# ignore non-hunk lines and lines being removed
		next if (!$hunk_line \|\| $line =~ /^-/);

		#trailing whitespace
		if ($line =~ /^\+.*\015/) {

Admin message