From 896a781a2af66dee7046244a65903d711ddba3dc Mon Sep 17 00:00:00 2001
From: chengshiwen <chengshiwen0103@gmail.com>
Date: Sat, 26 Feb 2022 09:36:48 +0800
Subject: [PATCH] fix #1033: some merge commits were not skipped in GitLab

---
 grimoire_elk/enriched/git.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grimoire_elk/enriched/git.py b/grimoire_elk/enriched/git.py
index 18d5aea3a..8aecfb627 100644
--- a/grimoire_elk/enriched/git.py
+++ b/grimoire_elk/enriched/git.py
@@ -277,7 +277,7 @@ def get_rich_item(self, item):
         lines_added = 0
         lines_removed = 0
         for cfile in commit["files"]:
-            if 'action' not in cfile:
+            if 'action' not in cfile or cfile['action'] in ['AM', 'MA', 'MM', 'MR', 'RM']:
                 # merges are not counted
                 continue
             eitem["files"] += 1