diff options
Diffstat (limited to 't/t9106-git-svn-commit-diff-clobber.sh')
| -rwxr-xr-x | t/t9106-git-svn-commit-diff-clobber.sh | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh index af367a181..f6d7ac7c5 100755 --- a/t/t9106-git-svn-commit-diff-clobber.sh +++ b/t/t9106-git-svn-commit-diff-clobber.sh @@ -6,9 +6,10 @@ test_description='git svn commit-diff clobber' test_expect_success 'initialize repo' ' mkdir import && - (cd import && - echo initial > file && - svn_cmd import -m "initial" . "$svnrepo" + ( + cd import && + echo initial >file && + svn_cmd import -m "initial" . "$svnrepo" ) && echo initial > file && git update-index --add file && @@ -16,10 +17,11 @@ test_expect_success 'initialize repo' ' ' test_expect_success 'commit change from svn side' ' svn_cmd co "$svnrepo" t.svn && - (cd t.svn && - echo second line from svn >> file && - poke file && - svn_cmd commit -m "second line from svn" + ( + cd t.svn && + echo second line from svn >>file && + poke file && + svn_cmd commit -m "second line from svn" ) && rm -rf t.svn ' @@ -44,10 +46,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 && - echo fourth line from svn >> file && - poke file && - svn_cmd commit -m "fourth line from svn" + ( + cd t.svn && + echo fourth line from svn >>file && + poke file && + svn_cmd commit -m "fourth line from svn" ) && rm -rf t.svn && echo "fourth line from git" >> file && @@ -68,8 +71,9 @@ 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 && - echo third line from svn >> file && + ( + cd t.svn && + echo third line from svn >>file && poke file && svn_cmd commit -m "third line from svn" ) && |