From 50574d5cd4d16f71a5945b1bedc0927fcc383d2c Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Fri, 4 Nov 2022 19:14:40 +0100
Subject: [PATCH] Better changelog gen between releases

---
 .../src/main/kotlin/jf.autoversion.gradle.kts | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/convention/src/main/kotlin/jf.autoversion.gradle.kts b/convention/src/main/kotlin/jf.autoversion.gradle.kts
index 698b3c6..a4ea621 100644
--- a/convention/src/main/kotlin/jf.autoversion.gradle.kts
+++ b/convention/src/main/kotlin/jf.autoversion.gradle.kts
@@ -3,6 +3,8 @@ import org.eclipse.jgit.api.Git
 import java.awt.Toolkit
 import java.awt.datatransfer.StringSelection
 
+val isRelease = project.hasProperty("release")
+
 versionS = "0.0.0+nogit"
 versionType = VersionType.ALPHA
 if (File(projectDir, ".git").exists()) {
@@ -20,16 +22,23 @@ if (File(projectDir, ".git").exists()) {
             }
             versionType = vt ?: VersionType.RELEASE
             if (vt != null) versionS = versionS.substring(1)
-            changelog += "Commits in ${versionType.displayName} $versionS:\n"
-            changelog += git.log(if (tags.size >= 2) tags[1].id else null, tags[0].id)
-                .reversed()
-                .joinToString("\n") { "- ${it.shortMessage}" }
+            if (isRelease) {
+                changelog += "Commits in ${versionType.displayName} $versionS:\n"
+                changelog += git.log(if (tags.size >= 2) tags[1].id else null, tags[0].id)
+                    .reversed()
+                    .joinToString("\n") { "- ${it.shortMessage}" }
+            } else {
+                changelog += "Commits after ${versionType.displayName} $versionS:\n"
+                changelog += git.log(tags[0].id)
+                    .reversed()
+                    .joinToString("\n") { "- ${it.shortMessage}" }
+            }
         }
     }
 }
 if (changelog == "") changelog = "No changelog"
 
-if (!project.hasProperty("release")) {
+if (!isRelease) {
     versionS += "-SNAPSHOT"
 }