Merge branch 'jh/notes-merge-in-git-dir-worktree'

diff --git a/t/t9123-git-svn-rebuild-with-rewriteroot.sh b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
index cf0415274c2d2abae7a6850818f4de8063cb61a7..fd8184787fba13bbbf3f1ef377ad3f979ef8f47a 100755 (executable)
--- a/t/t9123-git-svn-rebuild-with-rewriteroot.sh
+++ b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
@@ -8,15 +8,15 @@ test_description='git svn respects rewriteRoot during rebuild'
 . ./lib-git-svn.sh
 
 mkdir import
-cd import
+(cd import
        touch foo
-       svn import -m 'import for git svn' . "$svnrepo" >/dev/null
-cd ..
+       svn_cmd import -m 'import for git svn' . "$svnrepo" >/dev/null
+)
 rm -rf import
 
 test_expect_success 'init, fetch and checkout repository' '
        git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" &&
-       git svn fetch
+       git svn fetch &&
        git checkout -b mybranch ${remotes_git_svn}
        '