From a5254b3df619688dda45d20c3d1628ae4decf474 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Sun, 4 Aug 2024 15:54:20 -0700
Subject: [PATCH] Tag message now has the `v{{version}}\n\n{changes}` format,
 as workaround for cli/cli#9299

---
 README.md                                | 2 ++
 src/main/resources/base/changelog.gradle | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e788ec1..1fdff23 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,8 @@
 
 # Changelog
 ## [Unreleased]
+### Changed
+- Tag message now has the `v{{version}}\n\n{changes}` format, as workaround for [cli/cli#9299](https://github.com/cli/cli/issues/9299).
 
 ## [8.0.0] - 2024-07-08
 ### Changed
diff --git a/src/main/resources/base/changelog.gradle b/src/main/resources/base/changelog.gradle
index d783414..e804338 100644
--- a/src/main/resources/base/changelog.gradle
+++ b/src/main/resources/base/changelog.gradle
@@ -31,7 +31,7 @@ if (tasks.names.contains('changelogCheck')) {
 	spotlessChangelog {
 		branch 'release'
 		appendDashSnapshotUnless_dashPrelease = true
-		tagMessage '{{changes}}'
+		tagMessage 'v{{version}}\n\n{{changes}}'
 		runAfterPush "gh release create release/{{version}} --title 'v{{version}}' --notes-from-tag"
 	}
 	// set the project version for POM, jar manifest, etc.