From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date: Mon, 10 Jan 2011 23:21:26 +0000 (+0000)
Subject: t9157-*.sh: Make the svn version check more precise
X-Git-Tag: v1.7.4-rc2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7fad99e14af6da89efe0d078e19ac8b7c02a3b5d;p=git.git

t9157-*.sh: Make the svn version check more precise

These tests require an svn version 1.5 or newer to run correctly.
In particular, all 1.4.x versions and earlier are too old, so fix
up the case label regex to cover this range exactly.

[Fix provided by Anders Kaseorg <andersk@MIT.EDU>]

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh
index accf61eb0..991d2aa1b 100755
--- a/t/t9157-git-svn-fetch-merge.sh
+++ b/t/t9157-git-svn-fetch-merge.sh
@@ -8,7 +8,7 @@ test_description='git svn merge detection'
 
 svn_ver="$(svn --version --quiet)"
 case $svn_ver in
-[0-1].[0-4].[0-6])
+0.* | 1.[0-4].*)
 	skip_all="skipping git-svn test - SVN too old ($svn_ver)"
 	test_done
 	;;