diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-07 03:46:36 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-07 03:46:36 +0400 |
| commit | 347c47e61e5daf1efb3503724a431e4316c6eb5b (patch) | |
| tree | f5c0c4da1c77b79cfa2831cfa2a55956d7be7528 /t/t9300-fast-import.sh | |
| parent | c2e0940b44ded03f0af02be95c35b231fea633c1 (diff) | |
| parent | fd4ec4f2bb980ce07bb28d5823a95610f251d00b (diff) | |
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/t9300-fast-import.sh')
| -rwxr-xr-x | t/t9300-fast-import.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 96d07f1833..7c059204e9 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1110,11 +1110,10 @@ test_expect_success \ 'P: supermodule & submodule mix' \ 'git fast-import <input && git checkout subuse1 && - rm -rf sub && mkdir sub && cd sub && + rm -rf sub && mkdir sub && (cd sub && git init && git fetch --update-head-ok .. refs/heads/sub:refs/heads/master && - git checkout master && - cd .. && + git checkout master) && git submodule init && git submodule update' |