]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
checkpatch-improve-git_commit_id-test-fix
authorAndrew Morton <akpm@linux-foundation.org>
Mon, 23 Aug 2021 23:59:59 +0000 (09:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Aug 2021 23:34:53 +0000 (09:34 +1000)
add missing &&

Cc: Denis Efremov <efremov@linux.com>
Cc: Dwaipayan Ray <dwaipayanray1@gmail.com>
Cc: Joe Perches <joe@perches.com>
Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
scripts/checkpatch.pl

index 7c33ffafa3f0ce0e6f26e195d2fb97773e849acb..c27d2312cfc307f4469ce7322b06e5025e2fb017 100755 (executable)
@@ -3181,7 +3181,7 @@ sub process {
 # possible SHA-1 matches.
 # A commit match can span multiple lines so this block attempts to find a
 # complete typical commit on a maximum of 3 lines
-               if ($perl_version_ok
+               if ($perl_version_ok &&
                    $in_commit_log && !$commit_log_possible_stack_dump &&
                    $line !~ /^\s*(?:Link|Patchwork|http|https|BugLink|base-commit):/i &&
                    $line !~ /^This reverts commit [0-9a-f]{7,40}/ &&