From cf57ff8b99509a5a822f17e7338d6ccd616471f2 Mon Sep 17 00:00:00 2001
From: John Tsichritzis <john.tsichritzis@arm.com>
Date: Fri, 12 Jul 2019 10:55:14 +0100
Subject: [PATCH] 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>
---
 .checkpatch.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.checkpatch.conf b/.checkpatch.conf
index 8b6c70eda..baa983dc9 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.