fix chaoss#1033: some merge commits were not skipped in GitLab

chengshiwen · Feb 26, 2022 · 896a781 · 896a781
1 parent b626512
commit 896a781
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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