X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft5510-fetch.sh;h=50c64856f0fd35fd14007e0603a1cf58ce702cec;hb=207dfa07919baba034291f1d5169f86272839d59;hp=e2e8c894f977f65dbb1085129dac2c2e56b0a318;hpb=74d20040cafdced657efbf49795183d209a3a07b;p=git.git diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index e2e8c894f..50c64856f 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -15,23 +15,22 @@ test_expect_success setup ' git commit -a -m original' test_expect_success "clone and setup child repos" ' - git_clone . one && + git clone . one && cd one && echo >file updated by one && git commit -a -m "updated by one" && cd .. && - git_clone . two && + git clone . two && cd two && - git repo-config branch.master.remote one && - { - echo "URL: ../one/.git/" - echo "Pull: refs/heads/master:refs/heads/one" - } >.git/remotes/one + 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_clone . three && + git clone . three && cd three && - git repo-config branch.master.remote two && - git repo-config branch.master.merge refs/heads/one && + 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" @@ -74,7 +73,7 @@ test_expect_success 'fetch following tags' ' mkdir four && cd four && - git_init_db && + git init && git fetch .. :track && git show-ref --verify refs/tags/anno &&