From 813db2b8f93272c968e1b7eeb4995a6e6d550569 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Thu, 4 Jul 2024 20:15:50 +0100 Subject: [PATCH] Ignore merge commits in release notes generation --- app/utils/git.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/utils/git.py b/app/utils/git.py index e287426e..75c950c8 100644 --- a/app/utils/git.py +++ b/app/utils/git.py @@ -153,7 +153,9 @@ def get_commit_list(git_url: str, start: str, end: str) -> List[str]: def get_release_notes(git_url: str, start: str, end: str) -> Optional[str]: commits = get_commit_list(git_url, start, end) + commits = [x for x in commits if not x.startswith("Merge ")] if len(commits) == 0: return None - return normalize_line_endings("\n".join(map(lambda x: f"- {x}", commits)) + f"\n") + text = "\n".join(map(lambda x: f"- {x}", commits)) + f"\n" + return normalize_line_endings(text)