From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 30 Aug 2023 14:36:29 +0000 (+0200)
Subject: scripts/make-archive.sh: more precise tag detection
X-Git-Tag: v6.0.2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fenvironments%2Fdocs-develop-upda-signxn%2Fdeployments%2F2658;p=thirdparty%2Fknot-resolver.git

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).
---

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)