From 735497670fabf10105e06995cda3382ccae67908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vladimir.cunat@nic.cz>
Date: Wed, 30 Aug 2023 16:36:29 +0200
Subject: [PATCH] scripts/make-archive.sh: more precise tag detection
This works better in the current case when master branch with the most
recent 5.7.0 tag got merged into the 6.0 branch. In that case we do not
want the most recent *generally* reachable tag, and git-describe has
probably good logic for this (using first-parent jumps I guess).
---
scripts/make-archive.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/make-archive.sh b/scripts/make-archive.sh
index b29622896..9f2be0ea7 100755
--- a/scripts/make-archive.sh
+++ b/scripts/make-archive.sh
@@ -11,7 +11,7 @@ cd "$(dirname ${0})/.."
if ! git describe --tags --exact-match; then
# devel version
- VERSION_TAG=$(git tag --merged HEAD --sort=-taggerdate | head -1)
+ VERSION_TAG=$(git describe --tags | cut -d- -f1)
VERSION=${VERSION_TAG#v}
GIT_HASH=$(git rev-parse --short=6 HEAD)
N_COMMITS=$(git rev-list $VERSION_TAG.. --count)
--
GitLab