diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-15 19:40:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-15 19:40:12 (GMT) |
| commit | e3f213c7aff9e09b3bde7253a0a922467dd13671 (patch) | |
| tree | e13c2d747a8afdbd96c001d88626204f0b4d20a9 /t/t5510-fetch.sh | |
| parent | 43d268e9dd5a454abc2e6ae676202773ffd54537 (diff) | |
| parent | fd3c32c9815441ebbc3d46a3ff4ef862b3a9688c (diff) | |
| download | git-e3f213c7aff9e09b3bde7253a0a922467dd13671.zip git-e3f213c7aff9e09b3bde7253a0a922467dd13671.tar.gz git-e3f213c7aff9e09b3bde7253a0a922467dd13671.tar.bz2 | |
Merge branch 'jl/fix-test'
* jl/fix-test:
t1020: Get rid of 'cd "$HERE"' at the start of each test
t2016 (checkout -p): add missing &&
t1302 (core.repositoryversion): style tweaks
t2105 (gitfile): add missing &&
t1450 (fsck): remove dangling objects
tests: subshell indentation stylefix
Several tests: cd inside subshell instead of around
Diffstat (limited to 't/t5510-fetch.sh')
| -rwxr-xr-x | t/t5510-fetch.sh | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index efb42d1..9a88475 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -21,27 +21,30 @@ test_expect_success setup ' test_expect_success "clone and setup child repos" ' git clone . one && - cd one && - echo >file updated by one && - git commit -a -m "updated by one" && - cd .. && + ( + cd one && + echo >file updated by one && + git commit -a -m "updated by one" + ) && git clone . 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 .. && + ( + 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 + ) && git clone . three && - cd three && - git config branch.master.remote two && - git config branch.master.merge refs/heads/one && - mkdir -p .git/remotes && - { - echo "URL: ../two/.git/" - echo "Pull: refs/heads/master:refs/heads/two" - echo "Pull: refs/heads/one:refs/heads/one" - } >.git/remotes/two && - cd .. && + ( + cd three && + git config branch.master.remote two && + git config branch.master.merge refs/heads/one && + mkdir -p .git/remotes && + { + echo "URL: ../two/.git/" + echo "Pull: refs/heads/master:refs/heads/two" + echo "Pull: refs/heads/one:refs/heads/one" + } >.git/remotes/two + ) && git clone . bundle && git clone . seven ' |