From: Johannes Schindelin Date: Thu, 11 May 2017 13:47:53 GMT Subject: [PATCH 06/11] PREVIEW: t5510: convert .git/remotes/ test to use a regular remote Message-ID: <1fd886af939e1fdb9a7e3a250f0b0fae56f716fb.1494509599.git.johannes.schindelin@gmx.de> In-Reply-To: We are about to stop supporting the .git/remotes/ and .git/branches/ feature. In preparation, t5510-fetch is adjusted *not* to verify that .git/remotes/ works. As the tests are entangled, we do not simply remove the test repository with such a remote, but convert it to use a regular remote instead. Signed-off-by: Johannes Schindelin --- t/t5510-fetch.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 668c54be41e..f51b3360348 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -46,12 +46,10 @@ test_expect_success "clone and setup child repos" ' 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 config remote.two.url ../two/.git/ && + git config remote.two.fetch refs/heads/master:refs/heads/two && + git config --add remote.two.fetch \ + refs/heads/one:refs/heads/one ) && git clone . bundle && git clone . seven -- 2.12.2.windows.2.800.gede8f145e06