Merge branch 'master' of https://github.com/vnwildman/git

diff --git a/t/t9103-git-svn-tracked-directory-removed.sh b/t/t9103-git-svn-tracked-directory-removed.sh
index 3413164cb127da9e8d601775769b3b049816173e..b28271345c63e752c02d6b3b867f8c59aba08ff8 100755 (executable)
--- a/t/t9103-git-svn-tracked-directory-removed.sh
+++ b/t/t9103-git-svn-tracked-directory-removed.sh
@@ -23,17 +23,19 @@ test_expect_success 'make history for tracking' '
 
 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