From 640a7034e05886b41d99fe5864ca5818d02964c8 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 29 May 2013 13:35:39 +1000 Subject: [PATCH] merge_old_version: default to the previous next- version --- merge_old_version | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/merge_old_version b/merge_old_version index 117c8ea..b20a8ef 100755 --- 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 -- 2.39.2