diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-19 09:50:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-19 09:50:37 (GMT) |
| commit | 75c384efb52d0e3eb1e8c2f53668b4066fe6a8d6 (patch) | |
| tree | 08fc25030e93d75633adc9d0673b82ce7c16e154 | |
| parent | 5fed4668153c9ca6e44ec84a0976089f515705aa (diff) | |
| download | git-75c384efb52d0e3eb1e8c2f53668b4066fe6a8d6.zip git-75c384efb52d0e3eb1e8c2f53668b4066fe6a8d6.tar.gz git-75c384efb52d0e3eb1e8c2f53668b4066fe6a8d6.tar.bz2 | |
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>
| -rwxr-xr-x | t/t5510-fetch.sh | 7 | ||||
| -rw-r--r-- | templates/remotes-- | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index a11ab0a..90eeeba 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 fae8870..0000000 --- a/templates/remotes-- +++ /dev/null @@ -1 +0,0 @@ -: this is just to ensure the directory exists. |