diff options
Diffstat (limited to 't/t9127-git-svn-partial-rebuild.sh')
| -rwxr-xr-x | t/t9127-git-svn-partial-rebuild.sh | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/t/t9127-git-svn-partial-rebuild.sh b/t/t9127-git-svn-partial-rebuild.sh index 87696a92dc..2e4789d061 100755 --- a/t/t9127-git-svn-partial-rebuild.sh +++ b/t/t9127-git-svn-partial-rebuild.sh @@ -9,27 +9,27 @@ test_description='git svn partial-rebuild tests' test_expect_success 'initialize svnrepo' ' mkdir import && ( - cd import && + (cd import && mkdir trunk branches tags && - cd trunk && - echo foo > foo && - cd .. && - svn import -m "import for git-svn" . "$svnrepo" >/dev/null && - svn copy "$svnrepo"/trunk "$svnrepo"/branches/a \ - -m "created branch a" && - cd .. && + (cd trunk && + echo foo > foo + ) && + svn_cmd import -m "import for git-svn" . "$svnrepo" >/dev/null && + svn_cmd copy "$svnrepo"/trunk "$svnrepo"/branches/a \ + -m "created branch a" + ) && rm -rf import && - svn co "$svnrepo"/trunk trunk && - cd trunk && + svn_cmd co "$svnrepo"/trunk trunk && + (cd trunk && echo bar >> foo && - svn ci -m "updated trunk" && - cd .. && - svn co "$svnrepo"/branches/a a && - cd a && + svn_cmd ci -m "updated trunk" + ) && + svn_cmd co "$svnrepo"/branches/a a && + (cd a && echo baz >> a && - svn add a && - svn ci -m "updated a" && - cd .. && + svn_cmd add a && + svn_cmd ci -m "updated a" + ) && git svn init --stdlayout "$svnrepo" ) ' @@ -41,11 +41,11 @@ test_expect_success 'import an early SVN revision into git' ' test_expect_success 'make full git mirror of SVN' ' mkdir mirror && ( - cd mirror && + (cd mirror && git init && git svn init --stdlayout "$svnrepo" && - git svn fetch && - cd .. + git svn fetch + ) ) ' |