X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9110-git-svn-use-svm-props.sh;h=047659fde1049777e7fe12113ecb305377b1f8f9;hb=9bd81e4249a419f9cde8fd68e033e263533f4914;hp=9db0d8fd8d36c5762e436e237575d24eb1699dde;hpb=070739fd351702ea9bb4f65595728ae25a488075;p=git.git

diff --git a/t/t9110-git-svn-use-svm-props.sh b/t/t9110-git-svn-use-svm-props.sh
index 9db0d8fd8..047659fde 100755
--- a/t/t9110-git-svn-use-svm-props.sh
+++ b/t/t9110-git-svn-use-svm-props.sh
@@ -7,44 +7,45 @@ test_description='git-svn useSvmProps test'
 
 . ./lib-git-svn.sh
 
-test_expect_success 'load svm repo' "
-	svnadmin load -q $rawsvnrepo < ../t9110/svm.dump &&
-	git-svn init -R arr -i bar $svnrepo/mirror/arr &&
-	git-svn init -R argh -i dir $svnrepo/mirror/argh &&
-	git-svn init -R argh -i e $svnrepo/mirror/argh/a/b/c/d/e &&
-	git-config svn.useSvmProps true &&
+test_expect_success 'load svm repo' '
+	svnadmin load -q "$rawsvnrepo" < ../t9110/svm.dump &&
+	git-svn init --minimize-url -R arr -i bar "$svnrepo"/mirror/arr &&
+	git-svn init --minimize-url -R argh -i dir "$svnrepo"/mirror/argh &&
+	git-svn init --minimize-url -R argh -i e \
+	  "$svnrepo"/mirror/argh/a/b/c/d/e &&
+	git config svn.useSvmProps true &&
 	git-svn fetch --all
-	"
+	'
 
 uuid=161ce429-a9dd-4828-af4a-52023f968c89
 
 bar_url=http://mayonaise/svnrepo/bar
 test_expect_success 'verify metadata for /bar' "
-	git-cat-file commit refs/remotes/bar | \
+	git cat-file commit refs/remotes/bar | \
 	   grep '^git-svn-id: $bar_url@12 $uuid$' &&
-	git-cat-file commit refs/remotes/bar~1 | \
+	git cat-file commit refs/remotes/bar~1 | \
 	   grep '^git-svn-id: $bar_url@11 $uuid$' &&
-	git-cat-file commit refs/remotes/bar~2 | \
+	git cat-file commit refs/remotes/bar~2 | \
 	   grep '^git-svn-id: $bar_url@10 $uuid$' &&
-	git-cat-file commit refs/remotes/bar~3 | \
+	git cat-file commit refs/remotes/bar~3 | \
 	   grep '^git-svn-id: $bar_url@9 $uuid$' &&
-	git-cat-file commit refs/remotes/bar~4 | \
+	git cat-file commit refs/remotes/bar~4 | \
 	   grep '^git-svn-id: $bar_url@6 $uuid$' &&
-	git-cat-file commit refs/remotes/bar~5 | \
+	git cat-file commit refs/remotes/bar~5 | \
 	   grep '^git-svn-id: $bar_url@1 $uuid$'
 	"
 
 e_url=http://mayonaise/svnrepo/dir/a/b/c/d/e
 test_expect_success 'verify metadata for /dir/a/b/c/d/e' "
-	git-cat-file commit refs/remotes/e | \
+	git cat-file commit refs/remotes/e | \
 	   grep '^git-svn-id: $e_url@1 $uuid$'
 	"
 
 dir_url=http://mayonaise/svnrepo/dir
 test_expect_success 'verify metadata for /dir' "
-	git-cat-file commit refs/remotes/dir | \
+	git cat-file commit refs/remotes/dir | \
 	   grep '^git-svn-id: $dir_url@2 $uuid$' &&
-	git-cat-file commit refs/remotes/dir~1 | \
+	git cat-file commit refs/remotes/dir~1 | \
 	   grep '^git-svn-id: $dir_url@1 $uuid$'
 	"