[PATCH] Adjust t5510 to put remotes in config
From: Johannes Schindelin <hidden>
Date: 2016-08-11 20:23:13
Subsystem:
the rest · Maintainer:
Linus Torvalds
Since .git/remotes/ is no longer created by default, t5510 failed. While at it, convert the tests to use the config way of specifying remotes instead of creating a file in .git/remotes/. Signed-off-by: Johannes Schindelin <redacted> --- t/t5510-fetch.sh | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index a11ab0a..6229433 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh@@ -23,20 +23,16 @@ test_expect_success "clone and setup child repos" ' 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 repo-config remote.one.url ../one/.git/ && + git repo-config remote.one.fetch refs/heads/master:refs/heads/one && cd .. && git clone . three && cd three && git repo-config branch.master.remote two && git repo-config branch.master.merge refs/heads/one && - { - echo "URL: ../two/.git/" - echo "Pull: refs/heads/master:refs/heads/two" - echo "Pull: refs/heads/one:refs/heads/one" - } >.git/remotes/two + git repo-config remote.two.url ../two/.git/ && + git repo-config remote.two.fetch refs/heads/master:refs/heads/two && + git repo-config --add remote.two.fetch refs/heads/one:refs/heads/one ' test_expect_success "fetch test" '
--
1.4.4.2.ga4be2-dirty