generate-changelog: skip merge commits

3700dc60 · intrigeri · 8e0865e6 · 3700dc60
Commit 3700dc60 authored Aug 24, 2020 by intrigeri
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

bin/generate-changelog bin/generate-changelog +5 -1

No files found.
--- a/bin/generate-changelog
+++ b/bin/generate-changelog
@@ -85,7 +85,11 @@ class ChangelogGenerator(object):
                    }
                    for issue in mr.closes_issues()
                ],
-                "commit_messages": [commit.title for commit in mr.commits()],
+                "commit_messages": [
+                    commit.title for commit in mr.commits()
+                    # Ignore merge commits
+                    if len(project.commits.get(commit.id).parent_ids) == 1
+                ],
            })
            # yapf: enable