Merge branch 'rs/patch-id-use-skip-prefix'

diff --git a/t/t9103-git-svn-tracked-directory-removed.sh b/t/t9103-git-svn-tracked-directory-removed.sh
index 963dd95e4a71ccefa64b9500c490f44ea6d7c789..b28271345c63e752c02d6b3b867f8c59aba08ff8 100755 (executable)
--- a/t/t9103-git-svn-tracked-directory-removed.sh
+++ b/t/t9103-git-svn-tracked-directory-removed.sh
@@ -10,30 +10,32 @@ test_expect_success 'make history for tracking' '
        mkdir import &&
        mkdir import/trunk &&
        echo hello >> import/trunk/README &&
-       svn import -m initial import "$svnrepo" &&
+       svn_cmd import -m initial import "$svnrepo" &&
        rm -rf import &&
-       svn co "$svnrepo"/trunk trunk &&
+       svn_cmd co "$svnrepo"/trunk trunk &&
        echo bye bye >> trunk/README &&
-       svn rm -m "gone" "$svnrepo"/trunk &&
+       svn_cmd rm -m "gone" "$svnrepo"/trunk &&
        rm -rf trunk &&
        mkdir trunk &&
        echo "new" > trunk/FOLLOWME &&
-       svn import -m "new trunk" trunk "$svnrepo"/trunk
+       svn_cmd import -m "new trunk" trunk "$svnrepo"/trunk
 '
 
 test_expect_success 'clone repo with git' '
        git svn clone -s "$svnrepo" x &&
-       test -f x/FOLLOWME &&
-       test ! -f x/README
+       test_path_is_file x/FOLLOWME &&
+       test_path_is_missing x/README
 '
 
-test_expect_success 'make sure r2 still has old file' "
-       cd x &&
-               test -n \"\$(git svn find-rev r1)\" &&
-               git reset --hard \$(git svn find-rev r1) &&
-               test -f README &&
-               test ! -f FOLLOWME &&
-               test x\$(git svn find-rev r2) = x
-"
+test_expect_success 'make sure r2 still has old file' '
+       (
+               cd x &&
+               test -n "$(git svn find-rev r1)" &&
+               git reset --hard "$(git svn find-rev r1)" &&
+               test_path_is_file README &&
+               test_path_is_missing FOLLOWME &&
+               test -z "$(git svn find-rev r2)"
+       )
+'
 
 test_done