From 9f54f6b655ddcaa4c8efd94d88e4b1a8e6186d84 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Wed, 3 Sep 2025 14:29:51 +0100
Subject: [PATCH 1/2] fixup! release: add Mac OSX installer build

---
 .github/macos-installer/Makefile           | 4 ++--
 .github/workflows/build-git-installers.yml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/macos-installer/Makefile b/.github/macos-installer/Makefile
index e824ef6673d501..08add1308c26b7 100644
--- a/.github/macos-installer/Makefile
+++ b/.github/macos-installer/Makefile
@@ -21,7 +21,7 @@ GIT_PREFIX := $(PREFIX)/git
 # Replace -rc with .rc in the version string
 # This is to ensure compatibility with the format as generated by GIT-VERSION-GEN
 ORIGINAL_VERSION := $(VERSION)
-VERSION := $(shell echo $(ORIGINAL_VERSION) | sed 's/-rc/.rc/g')
+VERSION := $(subst -rc,.rc,$(VERSION))
 
 BUILD_DIR := $(GITHUB_WORKSPACE)/payload
 DESTDIR := $(PWD)/stage/git-$(ARCH_UNIV)-$(VERSION)
@@ -159,6 +159,6 @@ endif
 ifdef APPLE_KEYCHAIN_PROFILE
 notarize:
 	@$(CURDIR)/../scripts/notarize.sh \
-		--package="disk-image/git-$(VERSION)-$(ARCH_UNIV).pkg" \
+		--package="disk-image/git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).pkg" \
 		--keychain-profile="$(APPLE_KEYCHAIN_PROFILE)"
 endif
diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml
index 67ef1bb867cd0b..3b9a0dcb1995cb 100644
--- a/.github/workflows/build-git-installers.yml
+++ b/.github/workflows/build-git-installers.yml
@@ -479,6 +479,7 @@ jobs:
 
           # Convert -rc to .rc to match GIT-VERSION-FILE behavior
           BUILD_VERSION=$(echo "${VERSION}" | sed 's/-rc/.rc/g')
+          echo "$BUILD_VERSION" >git/version
 
           # Configure universal build
           cat >git/config.mak <<EOF

From 5ef482badde69bc498b0aacc254c11ddc60c59d2 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Wed, 3 Sep 2025 14:18:45 +0100
Subject: [PATCH 2/2] fixup! release: build unsigned Ubuntu .deb package

---
 .github/workflows/build-git-installers.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml
index 3b9a0dcb1995cb..9c998e7e9f371e 100644
--- a/.github/workflows/build-git-installers.yml
+++ b/.github/workflows/build-git-installers.yml
@@ -602,6 +602,10 @@ jobs:
           }
 
           VERSION="${{ needs.prereqs.outputs.tag_version }}"
+
+          # Convert -rc to .rc to match GIT-VERSION-FILE behavior
+          BUILD_VERSION=$(echo "${VERSION}" | sed 's/-rc/.rc/g')
+          echo "$BUILD_VERSION" >git/version
           make -C git GIT-VERSION-FILE
 
           ARCH="$(dpkg-architecture -q DEB_HOST_ARCH)"