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/t5510-fetch.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/t5510-fetch.sh')
| -rwxr-xr-x | t/t5510-fetch.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 4eb10f602f..34d59d5766 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -21,18 +21,18 @@ test_expect_success setup ' test_expect_success "clone and setup child repos" ' git clone . one && - cd one && + (cd one && echo >file updated by one && - git commit -a -m "updated by one" && - cd .. && + git commit -a -m "updated by one" + ) && git clone . two && - cd two && + (cd two && git config branch.master.remote one && git config remote.one.url ../one/.git/ && - git config remote.one.fetch refs/heads/master:refs/heads/one && - cd .. && + git config remote.one.fetch refs/heads/master:refs/heads/one + ) && git clone . three && - cd three && + (cd three && git config branch.master.remote two && git config branch.master.merge refs/heads/one && mkdir -p .git/remotes && @@ -40,8 +40,8 @@ test_expect_success "clone and setup child repos" ' echo "URL: ../two/.git/" echo "Pull: refs/heads/master:refs/heads/two" echo "Pull: refs/heads/one:refs/heads/one" - } >.git/remotes/two && - cd .. && + } >.git/remotes/two + ) && git clone . bundle && git clone . seven ' |