[Linux-kernel-mentees] [PATCH] checkpatch: add fix option for ERROR:GERRIT_CHANGE_ID

Aditya Srivastava yashsri421 at gmail.com
Fri Oct 30 08:23:35 UTC 2020


Currently, whenever gerrit change id is present in commit, checkpatch.pl
gives an error to remove the change id before submitting the patch.

For eg, running checkpatch on commit adc311a5bbf6 ("iwlwifi: bump FW
API to 53 for 22000 series"), causes error:

ERROR:GERRIT_CHANGE_ID: Remove Gerrit Change-Id's before submitting
upstream
Change-Id: I5725e46394f3f53c3069723fd513cc53c7df383d

But there is no --fix option present for this error message, in case
user wants to fix it immediately.

To fix this error, delete the corresponding line from the patchfile when
checkpatch.pl is executed with --fix

Signed-off-by: Aditya Srivastava <yashsri421 at gmail.com>
---
 scripts/checkpatch.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 7800a090e8fe..5329927fc1c1 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2852,8 +2852,11 @@ sub process {
 
 # Check for Gerrit Change-Ids not in any patch context
 		if ($realfile eq '' && !$has_patch_separator && $line =~ /^\s*change-id:/i) {
-			ERROR("GERRIT_CHANGE_ID",
-			      "Remove Gerrit Change-Id's before submitting upstream\n" . $herecurr);
+			if (ERROR("GERRIT_CHANGE_ID",
+			          "Remove Gerrit Change-Id's before submitting upstream\n" . $herecurr) &&
+			    $fix) {
+                                fix_delete_line($fixlinenr, $rawline);
+                        }
 		}
 
 # Check if the commit log is in a possible stack dump
-- 
2.17.1



More information about the Linux-kernel-mentees mailing list