X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9127-git-svn-partial-rebuild.sh;h=2e4789d061fe084024b621708ee27e629c2a004a;hb=bc979945305b87caf1e5975d30d42bafd88ad846;hp=87696a92dc82fad38e89a97af4a74ede84057241;hpb=0d5055665ca1e76659ffa96bf972b4b0125ea069;p=git.git

diff --git a/t/t9127-git-svn-partial-rebuild.sh b/t/t9127-git-svn-partial-rebuild.sh
index 87696a92d..2e4789d06 100755
--- a/t/t9127-git-svn-partial-rebuild.sh
+++ b/t/t9127-git-svn-partial-rebuild.sh
@@ -9,27 +9,27 @@ test_description='git svn partial-rebuild tests'
 test_expect_success 'initialize svnrepo' '
 	mkdir import &&
 	(
-		cd import &&
+		(cd import &&
 		mkdir trunk branches tags &&
-		cd trunk &&
-		echo foo > foo &&
-		cd .. &&
-		svn import -m "import for git-svn" . "$svnrepo" >/dev/null &&
-		svn copy "$svnrepo"/trunk "$svnrepo"/branches/a \
-			-m "created branch a" &&
-		cd .. &&
+		(cd trunk &&
+		echo foo > foo
+		) &&
+		svn_cmd import -m "import for git-svn" . "$svnrepo" >/dev/null &&
+		svn_cmd copy "$svnrepo"/trunk "$svnrepo"/branches/a \
+			-m "created branch a"
+		) &&
 		rm -rf import &&
-		svn co "$svnrepo"/trunk trunk &&
-		cd trunk &&
+		svn_cmd co "$svnrepo"/trunk trunk &&
+		(cd trunk &&
 		echo bar >> foo &&
-		svn ci -m "updated trunk" &&
-		cd .. &&
-		svn co "$svnrepo"/branches/a a &&
-		cd a &&
+		svn_cmd ci -m "updated trunk"
+		) &&
+		svn_cmd co "$svnrepo"/branches/a a &&
+		(cd a &&
 		echo baz >> a &&
-		svn add a &&
-		svn ci -m "updated a" &&
-		cd .. &&
+		svn_cmd add a &&
+		svn_cmd ci -m "updated a"
+		) &&
 		git svn init --stdlayout "$svnrepo"
 	)
 '
@@ -41,11 +41,11 @@ test_expect_success 'import an early SVN revision into git' '
 test_expect_success 'make full git mirror of SVN' '
 	mkdir mirror &&
 	(
-		cd mirror &&
+		(cd mirror &&
 		git init &&
 		git svn init --stdlayout "$svnrepo" &&
-		git svn fetch &&
-		cd ..
+		git svn fetch
+		)
 	)
 '