X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=merge_old_version;h=c5975ecc75e5f150b4d86408fdd644021ec199e7;hb=HEAD;hp=117c8ea5b3e2cd6a3f81d7f5d60c0019abbb24dd;hpb=2e06b9fa1987fc605256698a9243fd6f3b50d25b;p=next-scripts

diff --git a/merge_old_version b/merge_old_version
index 117c8ea..c5975ec 100755
--- a/merge_old_version
+++ b/merge_old_version
@@ -6,16 +6,18 @@ no_build=false
 	no_build=true
 }
 
-tree=$1
-shift
-ver=$1
-shift
-
-rev=$(git show next-${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
-[ "$rev" ] || {
-	echo "No such tree/date" 1>&2
-	exit 1
-}
+if [ "$1" ]; then
+	tree=$1
+	shift
+else
+	tree=
+fi
+if [ "$1" ]; then
+	ver="next-${1#next-}"
+	shift
+else
+	ver=$(git tag -l next-\* | sort | tail -n 1)
+fi
 
 . "$(dirname $0)/common.sh"
 
@@ -31,13 +33,33 @@ execute()
 	return ${PIPESTATUS[0]}
 }
 
+line="$(tail -n 1 $SHA1_FILE)"
+
+# strip everything after the first tab character
+stree=${line%%	*}
+if [ "$tree" ]; then
+	[ "$tree" = "$stree" ] || {
+		echo "That is not the last tree merged ($tree v $stree)" 1>&2
+		exit 1
+	}
+else
+	tree="$stree"
+fi
+
+rev=$(git show ${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
+[ "$rev" ] || {
+	echo "No previous tree/date ($tree/$ver)" 1>&2
+	exit 1
+}
+
 bad_rev=$(git rev-parse --verify 'HEAD^2')
 
-line="$(tail -n 1 $SHA1_FILE)"
 tab="\t"
 [ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
-expected=$(printf "%s$tab%s" $tree $bad_rev)
-[ "$line" = "$expected" ] || {
+
+# strip evrything up to the last tab character
+srev=${line##*	}
+[ "$bad_rev" = "$srev" ] || {
 	echo "bad last line in $SHA1_FILE" 1>&2
 	exit 1
 }
@@ -71,14 +93,14 @@ d=$(date --date "5 hours ago" '+%Y%m%d')
 sed -i '$d' $SHA1_FILE
 printf "%s$tab%s\n" $tree $rev >>$SHA1_FILE
 
-$no_build && exit 0
-
-git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
 	echo git push failed 1>&2
 	bash -i || exit
 }
 
-"$bin_dir/do_build" || {
+$no_build && exit 0
+
+"$bin_dir/do_build" "$tree" || {
 	echo Build failed 1>&2
 	bash -i || exit
 }