From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Sep 2025 00:23:30 +0000 (+1000)
Subject: merge_old_version: remove tree command line argument
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=8f9bc023f03745548ce5787da0aba1b7a722a1db;p=next-scripts

merge_old_version: remove tree command line argument

You can only change to the old version of the latest merge
so there is no point in passing it in
---

diff --git a/merge_old_version b/merge_old_version
index 02db4b8..9883616 100755
--- a/merge_old_version
+++ b/merge_old_version
@@ -6,12 +6,6 @@ if [ "$1" = "-n" ]; then
 	no_build=true
 fi
 
-if [ "$1" ]; then
-	tree=$1
-	shift
-else
-	tree=
-fi
 if [ "$1" ]; then
 	ver="next-${1#next-}"
 	shift
@@ -37,15 +31,7 @@ execute()
 line="$(tail -n 1 "$SHA1_FILE")"
 
 # strip everything after the first tab character
-stree=${line%%	*}
-if [ "$tree" ]; then
-	if [ "$tree" != "$stree" ]; then
-		echo "That is not the last tree merged ($tree v $stree)" 1>&2
-		exit 1
-	fi
-else
-	tree="$stree"
-fi
+tree=${line%%	*}
 
 if [ -z "$ver" ] && [ -f "../old-versions/$tree" ]; then
 	ver=$(cat "../old-versions/$tree")