diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2010-09-06 20:39:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 14:30:53 -0700 |
| commit | fd4ec4f2bb980ce07bb28d5823a95610f251d00b (patch) | |
| tree | 824a488c7708e4271f157f15c760947890a2e0bc /t/t9106-git-svn-commit-diff-clobber.sh | |
| parent | af24059fa299f1656692f5807eddd3b30b5f3cfb (diff) | |
| download | git-fd4ec4f2bb980ce07bb28d5823a95610f251d00b.tar.gz | |
Several tests: cd inside subshell instead of around
Fixed all places where it was a straightforward change from cd'ing into a
directory and back via "cd .." to a cd inside a subshell.
Found these places with "git grep -w "cd \.\.".
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9106-git-svn-commit-diff-clobber.sh')
| -rwxr-xr-x | t/t9106-git-svn-commit-diff-clobber.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh index 12f21b700e..af367a1814 100755 --- a/t/t9106-git-svn-commit-diff-clobber.sh +++ b/t/t9106-git-svn-commit-diff-clobber.sh @@ -6,21 +6,21 @@ test_description='git svn commit-diff clobber' test_expect_success 'initialize repo' ' mkdir import && - cd import && + (cd import && echo initial > file && - svn_cmd import -m "initial" . "$svnrepo" && - cd .. && + svn_cmd import -m "initial" . "$svnrepo" + ) && echo initial > file && git update-index --add file && git commit -a -m "initial" ' test_expect_success 'commit change from svn side' ' svn_cmd co "$svnrepo" t.svn && - cd t.svn && + (cd t.svn && echo second line from svn >> file && poke file && - svn_cmd commit -m "second line from svn" && - cd .. && + svn_cmd commit -m "second line from svn" + ) && rm -rf t.svn ' @@ -44,11 +44,11 @@ test_expect_success 'dcommit fails to commit because of conflict' ' git svn fetch && git reset --hard refs/${remotes_git_svn} && svn_cmd co "$svnrepo" t.svn && - cd t.svn && + (cd t.svn && echo fourth line from svn >> file && poke file && - svn_cmd commit -m "fourth line from svn" && - cd .. && + svn_cmd commit -m "fourth line from svn" + ) && rm -rf t.svn && echo "fourth line from git" >> file && git commit -a -m "fourth line from git" && @@ -68,11 +68,11 @@ test_expect_success 'dcommit does the svn equivalent of an index merge' " test_expect_success 'commit another change from svn side' ' svn_cmd co "$svnrepo" t.svn && - cd t.svn && + (cd t.svn && echo third line from svn >> file && poke file && - svn_cmd commit -m "third line from svn" && - cd .. && + svn_cmd commit -m "third line from svn" + ) && rm -rf t.svn ' |