| Message ID | 1485436265-12573-4-git-send-email-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jan 26, 2017 at 02:11:03PM +0100, Thomas Huth wrote: > This is a port of the following commit from the Linux kernel: > > commit 29ee1b0c67e0dd7dea8dd718e8326076bce5b6fe > Author: Joe Perches <joe@perches.com> > Date: Wed Aug 6 16:10:35 2014 -0700 > > checkpatch: ignore email headers better > > There are some patches created by git format-patch that when scanned by > checkpatch report errors on lines like > > To: address.tld > > This is a checkpatch false positive. > > Improve the logic a bit to ignore folded email headers to avoid emitting > these messages. > > 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> > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > scripts/checkpatch.pl | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 0f88e3b..52ad64a 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1094,7 +1094,7 @@ sub process { my $signoff = 0; my $is_patch = 0; - my $in_header_lines = 1; + my $in_header_lines = $file ? 0 : 1; my $in_commit_log = 0; #Scanning lines before patch my $non_utf8_charset = 0; @@ -1321,7 +1321,8 @@ sub process { # Check if it's the start of a commit log # (not a header line and we haven't seen the patch filename) if ($in_header_lines && $realfile =~ /^$/ && - $rawline !~ /^(commit\b|from\b|\w+:).+$/i) { + !($rawline =~ /^\s+\S/ || + $rawline =~ /^(commit\b|from\b|[\w-]+:).*$/i)) { $in_header_lines = 0; $in_commit_log = 1; }
This is a port of the following commit from the Linux kernel: commit 29ee1b0c67e0dd7dea8dd718e8326076bce5b6fe Author: Joe Perches <joe@perches.com> Date: Wed Aug 6 16:10:35 2014 -0700 checkpatch: ignore email headers better There are some patches created by git format-patch that when scanned by checkpatch report errors on lines like To: address.tld This is a checkpatch false positive. Improve the logic a bit to ignore folded email headers to avoid emitting these messages. 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> Signed-off-by: Thomas Huth <thuth@redhat.com> --- scripts/checkpatch.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)