Merge branch 'nd/status-long'

diff --git a/t/t9105-git-svn-commit-diff.sh b/t/t9105-git-svn-commit-diff.sh
index 63230367bb1566384e66e1b5ddd6a68e1ae98c8f..5d0afeae6caf03ca34d7ef883baed512bcbcec51 100755 (executable)
--- a/t/t9105-git-svn-commit-diff.sh
+++ b/t/t9105-git-svn-commit-diff.sh
@@ -1,15 +1,16 @@
 #!/bin/sh
 #
 # Copyright (c) 2006 Eric Wong
-test_description='git-svn commit-diff'
+test_description='git svn commit-diff'
 . ./lib-git-svn.sh
 
 test_expect_success 'initialize repo' '
        mkdir import &&
-       cd import &&
-       echo hello > readme &&
-       svn import -m "initial" . "$svnrepo" &&
-       cd .. &&
+       (
+               cd import &&
+               echo hello >readme &&
+               svn_cmd import -m "initial" . "$svnrepo"
+       ) &&
        echo hello > readme &&
        git update-index --add readme &&
        git commit -a -m "initial" &&
@@ -26,17 +27,17 @@ prev=`git rev-parse --verify HEAD^1`
 
 test_expect_success 'test the commit-diff command' '
        test -n "$prev" && test -n "$head" &&
-       git-svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
-       svn co "$svnrepo" wc &&
+       git svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
+       svn_cmd co "$svnrepo" wc &&
        cmp readme wc/readme
        '
 
-test_expect_success 'commit-diff to a sub-directory (with git-svn config)' '
-       svn import -m "sub-directory" import "$svnrepo"/subdir &&
-       git-svn init --minimize-url "$svnrepo"/subdir &&
-       git-svn fetch &&
-       git-svn commit-diff -r3 "$prev" "$head" &&
-       svn cat "$svnrepo"/subdir/readme > readme.2 &&
+test_expect_success 'commit-diff to a sub-directory (with git svn config)' '
+       svn_cmd import -m "sub-directory" import "$svnrepo"/subdir &&
+       git svn init --minimize-url "$svnrepo"/subdir &&
+       git svn fetch &&
+       git svn commit-diff -r3 "$prev" "$head" &&
+       svn_cmd cat "$svnrepo"/subdir/readme > readme.2 &&
        cmp readme readme.2
        '