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 02db4b876a7165a9405692acd63ccf5b6beea531..9883616ba4d98228044bb5c7c29dd7d8074f1e1c 100755 (executable)
--- 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")