diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:40:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:40:12 -0700 |
| commit | e3f213c7aff9e09b3bde7253a0a922467dd13671 (patch) | |
| tree | e13c2d747a8afdbd96c001d88626204f0b4d20a9 /t/t9128-git-svn-cmd-branch.sh | |
| parent | Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor' (diff) | |
| parent | t1020: Get rid of 'cd "$HERE"' at the start of each test (diff) | |
| download | tgif-e3f213c7aff9e09b3bde7253a0a922467dd13671.tar.xz | |
Merge branch 'jl/fix-test'
* jl/fix-test:
t1020: Get rid of 'cd "$HERE"' at the start of each test
t2016 (checkout -p): add missing &&
t1302 (core.repositoryversion): style tweaks
t2105 (gitfile): add missing &&
t1450 (fsck): remove dangling objects
tests: subshell indentation stylefix
Several tests: cd inside subshell instead of around
Diffstat (limited to 't/t9128-git-svn-cmd-branch.sh')
| -rwxr-xr-x | t/t9128-git-svn-cmd-branch.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/t/t9128-git-svn-cmd-branch.sh b/t/t9128-git-svn-cmd-branch.sh index 807e494a3a..4b034a67f3 100755 --- a/t/t9128-git-svn-cmd-branch.sh +++ b/t/t9128-git-svn-cmd-branch.sh @@ -9,19 +9,19 @@ 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_cmd import -m "import for git-svn" . "$svnrepo" >/dev/null && - cd .. && + (cd trunk && + echo foo > foo + ) && + svn_cmd import -m "import for git-svn" . "$svnrepo" >/dev/null + ) && rm -rf import && svn_cmd co "$svnrepo"/trunk trunk && - cd trunk && + (cd trunk && echo bar >> foo && - svn_cmd ci -m "updated trunk" && - cd .. && + svn_cmd ci -m "updated trunk" + ) && rm -rf trunk ) ' |