From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Sep 2025 00:34:35 +0000 (+1000)
Subject: merge_old_verion: use the ../old-versions/<tree> version
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=b18cc3b19d65583878db2183c5b966dced64b7ec;p=next-scripts

merge_old_verion: use the ../old-versions/<tree> version
---

diff --git a/merge_old_version b/merge_old_version
index d0d8403..02db4b8 100755
--- a/merge_old_version
+++ b/merge_old_version
@@ -15,8 +15,6 @@ fi
 if [ "$1" ]; then
 	ver="next-${1#next-}"
 	shift
-else
-	ver=$(git tag -l next-\* | sort | tail -n 1)
 fi
 
 tools_dir=$(dirname "$0")
@@ -49,6 +47,13 @@ else
 	tree="$stree"
 fi
 
+if [ -z "$ver" ] && [ -f "../old-versions/$tree" ]; then
+	ver=$(cat "../old-versions/$tree")
+fi
+if [ -z "$ver" ]; then
+	ver=$(git tag -l --sort=refname next-\* | tail -n 1)
+fi
+
 rev=$(git show "$ver:Next/SHA1s" | sed -n "s/^$tree\t\t*//p")
 if [ -z "$rev" ]; then
 	echo "No previous tree/date ($tree/$ver)" 1>&2