From 515540e633057fa0f6dfb8c03d6274690728547e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Wed, 26 Mar 2025 11:40:15 +0100
Subject: [PATCH] bin/make-snapshot.sh: Merge latest stable again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While git describe isn't used anymore, something else
is and this still requires a reachable tag…

fixes #38
---
 bin/make-snapshot.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bin/make-snapshot.sh b/bin/make-snapshot.sh
index a23834a..8b832e3 100755
--- a/bin/make-snapshot.sh
+++ b/bin/make-snapshot.sh
@@ -18,4 +18,11 @@ if [[ -n $(git branch | grep $BRANCH) ]]; then
 fi
 
 git checkout -b $BRANCH
+
+git mv composer.lock composer.lock.bak
+git commit -am "Backup composer.lock"
+git merge --no-ff -m "Merge latest tag, package pipelines require it" $LATEST_TAG
+git mv -f composer.lock.bak composer.lock
+git commit -am "Restore composer.lock"
+
 bin/make-release.sh "$NEXT_VERSION-dev" --no-checkout