diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-07 01:46:36 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-07 01:46:36 +0200 |
| commit | 347c47e61e5daf1efb3503724a431e4316c6eb5b (patch) | |
| tree | f5c0c4da1c77b79cfa2831cfa2a55956d7be7528 /t/t9114-git-svn-dcommit-merge.sh | |
| parent | t3404 & t7508: cd inside subshell instead of around (diff) | |
| parent | Several tests: cd inside subshell instead of around (diff) | |
| download | git-347c47e61e5daf1efb3503724a431e4316c6eb5b.tar.xz git-347c47e61e5daf1efb3503724a431e4316c6eb5b.zip | |
Merge branch 'jl/maint-fix-test'
* jl/maint-fix-test:
Several tests: cd inside subshell instead of around
Conflicts:
t/t9600-cvsimport.sh
Diffstat (limited to 't/t9114-git-svn-dcommit-merge.sh')
| -rwxr-xr-x | t/t9114-git-svn-dcommit-merge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh index 84f7c9b4bb..a7d0c7d99e 100755 --- a/t/t9114-git-svn-dcommit-merge.sh +++ b/t/t9114-git-svn-dcommit-merge.sh @@ -37,11 +37,11 @@ EOF test_expect_success 'setup svn repository' ' svn_cmd co "$svnrepo" mysvnwork && mkdir -p mysvnwork/trunk && - cd mysvnwork && + (cd mysvnwork && big_text_block >> trunk/README && svn_cmd add trunk && - svn_cmd ci -m "first commit" trunk && - cd .. + svn_cmd ci -m "first commit" trunk + ) ' test_expect_success 'setup git mirror and merge' ' |