Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Kari Argillander <kari.argillander@gmail.com>
To:     apw@canonical.com, joe@perches.com
Cc:     Kari Argillander <kari.argillander@gmail.com>,
        dwaipayanray1@gmail.com, lukas.bulwahn@gmail.com,
        linux-kernel@vger.kernel.org, ntfs3@lists.linux.dev
Subject: [PATCH v2] checkpatch: Improve CVS revision marker check
Date:   Wed, 27 Oct 2021 13:56:36 +0300
Message-Id: <20211027105636.29571-1-kari.argillander@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

This check gives false alarms at least in fs/ntfs3/ as there $LogFile is
used quite lot because it is name of file which logs NTFS metadata. This
improves check so it does not false alarm so easily.

Signed-off-by: Kari Argillander <kari.argillander@gmail.com>
---
v2:
	- Just improve checking. Thank for Jow Perches for regex.
v1:
Link: lore.kernel.org/ntfs3/20211026231637.3750-1-kari.argillander@gmail.com
---
 scripts/checkpatch.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 461d4221e4a4..a45c6274fcb4 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4018,7 +4018,7 @@ sub process {
 		}
 
 # check for RCS/CVS revision markers
-		if ($rawline =~ /^\+.*\$(Revision|Log|Id)(?:\$|)/) {
+		if ($rawline =~ /^\+.*\$(?:Revision|Log|Id)(?::.*)?\$/) {
 			WARN("CVS_KEYWORD",
 			     "CVS style keyword markers, these will _not_ be updated\n". $herecurr);
 		}
-- 
2.30.2