[PATCH] Use .git/remote/origin, not .git/branches/origin.

Now multi-head fetch is complete, let's migrate the
default configuration for new repositories created with
the "git clone" command.

The original $GIT_DIR/branches is not deprecated yet, but create
remotes directory by default from the templates as well.

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

diff --git a/git-clone-script b/git-clone-script
index 99c2459631f2bdcc6382bd2b5fc03090e1888ee3..f988b8c9c79fbb9ec9c3cad556cb4c9d51984475 100755 (executable)
--- a/git-clone-script
+++ b/git-clone-script
@@ -127,6 +127,8 @@ yes,yes)
 esac
 
 # Update origin.
-mkdir -p "$D/.git/branches/" &&
-rm -f "$D/.git/branches/origin" &&
-echo "$repo" >"$D/.git/branches/origin"
+mkdir -p "$D/.git/remotes/" &&
+rm -f "$D/.git/remotes/origin" &&
+echo >"$D/.git/remotes/origin" \
+"URL: $repo
+Pull: master:origin"

diff --git a/templates/remotes-- b/templates/remotes--
new file mode 100644 (file)
index 0000000..fae8870
--- /dev/null
+++ b/templates/remotes--
@@ -0,0 +1 @@
+: this is just to ensure the directory exists.