From: Junio C Hamano <junkio@cox.net>
Date: Tue, 19 Dec 2006 09:50:37 +0000 (-0800)
Subject: Do not create $GIT_DIR/remotes/ directory anymore.
X-Git-Tag: v1.5.0-rc0~56^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=75c384efb52d0e3eb1e8c2f53668b4066fe6a8d6;p=git.git

Do not create $GIT_DIR/remotes/ directory anymore.

Because we do not use --no-separate-remote anymore, there is no
reason to create that directory from the template.

t5510 test is updated to test both $GIT_DIR/remotes/ based
configuration and $GIT_DIR/config variable (credits to
Johannes).

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index a11ab0ad4..90eeeba2a 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -23,15 +23,14 @@ 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 &&
+	mkdir -p .git/remotes &&
 	{
 		echo "URL: ../two/.git/"
 		echo "Pull: refs/heads/master:refs/heads/two"
diff --git a/templates/remotes-- b/templates/remotes--
deleted file mode 100644
index fae88709a..000000000
--- a/templates/remotes--
+++ /dev/null
@@ -1 +0,0 @@
-: this is just to ensure the directory exists.