From 3d3b68360e5317a2579f19e1c73cae7fd3f959fd Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 21 Jan 2013 15:23:00 +1100
Subject: [PATCH] merge_old_version: fix problem with more than on match

---
 merge_old_version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge_old_version b/merge_old_version
index 759bb5a..2746de8 100755
--- a/merge_old_version
+++ b/merge_old_version
@@ -14,7 +14,7 @@ no_build=false
 tree=$1
 ver=$2
 
-rev=$(git show next-${ver}:Next/SHA1s | sed -n "s/^$tree\t*//p")
+rev=$(git show next-${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
 [ "$rev" ] || {
 	echo "No such tree/date" 1>&2
 	exit 1
-- 
2.39.5