merge_old_version: default to the previous next- version

[next-scripts] / merge_old_version

diff --git a/merge_old_version b/merge_old_version
index 117c8ea5b3e2cd6a3f81d7f5d60c0019abbb24dd..b20a8eff6685cb04108cdcade1f998b575bcc27a 100755 (executable)
--- a/merge_old_version
+++ b/merge_old_version
@@ -8,10 +8,14 @@ no_build=false
 
 tree=$1
 shift
-ver=$1
-shift
+if [ "$1" ]; then
+       ver="next-${1#next-}"
+       shift
+else
+       ver=$(git tag -l next-\* | sort | tail -n 1)
+fi
 
-rev=$(git show next-${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
+rev=$(git show ${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
 [ "$rev" ] || {
        echo "No such tree/date" 1>&2
        exit 1