checkpatch: fix long line messages about patch context

JoePerches · torvalds · commit b4749e96a4a8 · 2015-07-17T16:39:53.000-07:00
Changes in ("checkpatch: categorize some long line length checks")
now erroneously reports long line defects in patch context.

Fix it.

Signed-off-by: Joe Perches &lt;joe@perches.com&gt;
Reported-by: Dan Carpenter &lt;dan.carpenter@oracle.com&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
@@ -2599,7 +2599,7 @@ sub process {
 # if LONG_LINE is ignored, the other 2 types are also ignored
 #
 
-		if ($length > $max_line_length) {
+		if ($line =~ /^\+/ && $length > $max_line_length) {
 			my $msg_type = "LONG_LINE";
 
 			# Check the allowed long line types first

Original file line number	Diff line number	Diff line change
`@@ -2599,7 +2599,7 @@ sub process {`
`2599`	`2599`	`# if LONG_LINE is ignored, the other 2 types are also ignored`
`2600`	`2600`	`#`
`2601`	`2601`
`2602`		`- if ($length > $max_line_length) {`
	`2602`	`+ if ($line =~ /^\+/ && $length > $max_line_length) {`
`2603`	`2603`	`my $msg_type = "LONG_LINE";`
`2604`	`2604`
`2605`	`2605`	`# Check the allowed long line types first`