X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9114-git-svn-dcommit-merge.sh;h=3077851015879fc147ded9bb573d02c13967eec9;hb=603ee0f0c3d1b8fc09929d185817c43e231317e7;hp=17b2855c4f308d463ea239f355549120dab4f80f;hpb=77f143bf3e218857ec8e5244d7e862e8e0c1a041;p=git.git diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh index 17b2855c4..307785101 100755 --- a/t/t9114-git-svn-dcommit-merge.sh +++ b/t/t9114-git-svn-dcommit-merge.sh @@ -35,13 +35,14 @@ EOF } test_expect_success 'setup svn repository' ' - svn co "$svnrepo" mysvnwork && + svn_cmd co "$svnrepo" mysvnwork && mkdir -p mysvnwork/trunk && - cd mysvnwork && - big_text_block >> trunk/README && - svn add trunk && - svn ci -m "first commit" trunk && - cd .. + ( + cd mysvnwork && + big_text_block >>trunk/README && + svn_cmd add trunk && + svn_cmd ci -m "first commit" trunk + ) ' test_expect_success 'setup git mirror and merge' '