summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-06-26 01:03:11 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-26 03:00:42 +0300
commit06330fc40e3f3034de4934ec347604b5e36c40c3 (patch)
treef80445441ec1301ec203463cedfda2d46ce8a1fc /scripts
parentf1a63678554f8f7ff0425361b0142a69c0b815df (diff)
downloadlinux-06330fc40e3f3034de4934ec347604b5e36c40c3.tar.xz
checkpatch: avoid NOT_UNIFIED_DIFF errors on cover-letter.patch files
Make an exception for the "Does not appear to be a unified-diff" error when scanning what appears to be git generated cover letters. Signed-off-by: Joe Perches <joe@perches.com> Suggested-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index ef24f92e10e5..69c4716d9e27 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -5614,7 +5614,7 @@ sub process {
exit(0);
}
- if (!$is_patch) {
+ if (!$is_patch && $file !~ /cover-letter\.patch$/) {
ERROR("NOT_UNIFIED_DIFF",
"Does not appear to be a unified-diff format patch\n");
}