summaryrefslogtreecommitdiff
path: root/.checkpatch.conf
diff options
context:
space:
mode:
authorJohn Tsichritzis <john.tsichritzis@arm.com>2019-07-12 10:55:14 +0100
committerJohn Tsichritzis <john.tsichritzis@arm.com>2019-07-12 11:06:24 +0100
commitcf57ff8b99509a5a822f17e7338d6ccd616471f2 (patch)
treeec8b6006c017952b87336dadb6987785d1df870e /.checkpatch.conf
parent21bde92ff6d20ef2d3a2651fd729a1579232313b (diff)
Re-apply GIT_COMMIT_ID check for checkpatch
As it turns out, Gerrit's merge commits don't always respect that format so these mistakes have to be ignored as false positives. Change-Id: I4e38d9c34c95588e7916fba4c154f017d8c92dec Signed-off-by: John Tsichritzis <john.tsichritzis@arm.com>
Diffstat (limited to '.checkpatch.conf')
-rw-r--r--.checkpatch.conf4
1 files changed, 4 insertions, 0 deletions
diff --git a/.checkpatch.conf b/.checkpatch.conf
index 8b6c70ed..baa983dc 100644
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -43,6 +43,10 @@
# Commit messages might contain a Gerrit Change-Id.
--ignore GERRIT_CHANGE_ID
+# Do not check the format of commit messages, as Gerrit's merge commits do not
+# preserve it.
+--ignore GIT_COMMIT_ID
+
# FILE_PATH_CHANGES reports this kind of message:
# "added, moved or deleted file(s), does MAINTAINERS need updating?"
# We do not use this MAINTAINERS file process in TF.