summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-20 03:05:42 -0700
committerJunio C Hamano <junkio@cox.net>2005-08-24 16:50:52 -0700
commit6687f8fea22e1e43ab163a8fe180155a0a0a956a (patch)
tree4d8711c6ccf0b21aa2a888a775680bd8bed5ad86
parent92c533ef0ea2cb43f0d7d493f006f5b4dfa7cda1 (diff)
downloadgit-6687f8fea22e1e43ab163a8fe180155a0a0a956a.tar.gz
[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>
-rwxr-xr-xgit-clone-script8
-rw-r--r--templates/remotes--1
2 files changed, 6 insertions, 3 deletions
diff --git a/git-clone-script b/git-clone-script
index 99c2459631..f988b8c9c7 100755
--- 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
index 0000000000..fae88709a6
--- /dev/null
+++ b/templates/remotes--
@@ -0,0 +1 @@
+: this is just to ensure the directory exists.