diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-06 16:46:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 16:46:36 -0700 |
| commit | 347c47e61e5daf1efb3503724a431e4316c6eb5b (patch) | |
| tree | f5c0c4da1c77b79cfa2831cfa2a55956d7be7528 /t/t9116-git-svn-log.sh | |
| parent | c2e0940b44ded03f0af02be95c35b231fea633c1 (diff) | |
| parent | fd4ec4f2bb980ce07bb28d5823a95610f251d00b (diff) | |
| download | git-347c47e61e5daf1efb3503724a431e4316c6eb5b.tar.gz git-347c47e61e5daf1efb3503724a431e4316c6eb5b.tar.xz | |
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/t9116-git-svn-log.sh')
| -rwxr-xr-x | t/t9116-git-svn-log.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9116-git-svn-log.sh b/t/t9116-git-svn-log.sh index 0374a7476..244b5cd3c 100755 --- a/t/t9116-git-svn-log.sh +++ b/t/t9116-git-svn-log.sh @@ -8,14 +8,14 @@ test_description='git svn log tests' test_expect_success 'setup repository and import' ' mkdir import && - cd import && + (cd import && for i in trunk branches/a branches/b \ tags/0.1 tags/0.2 tags/0.3; do mkdir -p $i && \ echo hello >> $i/README || exit 1 done && \ svn_cmd import -m test . "$svnrepo" - cd .. && + ) && git svn init "$svnrepo" -T trunk -b branches -t tags && git svn fetch && git reset --hard trunk && |