Merge "Re-apply GIT_COMMIT_ID check for checkpatch" into integration

3ce3ce07 · Sandrine Bailleux · TrustedFirmware Code Review · 70f7c4e1 · cf57ff8b · 3ce3ce07
Commit 3ce3ce07 authored 5 years ago by Sandrine Bailleux Committed by TrustedFirmware Code Review 5 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 0 deletions
+4 -0
--- 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.