feat(changelog): Do not include merge commits in the changelog

Fixes jreleaser#858
gastaldi · Jul 6, 2022 · 903b73d · 903b73d
1 parent d6b9e6a
commit 903b73d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/sdks/git-sdk/src/main/java/org/jreleaser/sdk/git/ChangelogGenerator.java b/sdks/git-sdk/src/main/java/org/jreleaser/sdk/git/ChangelogGenerator.java
@@ -115,6 +115,8 @@ private String createChangelog(JReleaserContext context) throws IOException {
                 lineSeparator() +
                 StreamSupport.stream(commits.spliterator(), false)
                     .sorted(revCommitComparator)
+                    // Do not include merge commits
+                    .filter(commit -> commit.getParentCount() < 2)
                     .map(commit -> formatCommit(commit, commitsUrl, changelog, commitSeparator))
                     .collect(Collectors.joining(commitSeparator));
         } catch (GitAPIException e) {