mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +00:00
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>
This commit is contained in:
parent
5fed466815
commit
75c384efb5
|
@ -23,15 +23,14 @@ test_expect_success "clone and setup child repos" '
|
||||||
git clone . two &&
|
git clone . two &&
|
||||||
cd two &&
|
cd two &&
|
||||||
git repo-config branch.master.remote one &&
|
git repo-config branch.master.remote one &&
|
||||||
{
|
git repo-config remote.one.url ../one/.git/ &&
|
||||||
echo "URL: ../one/.git/"
|
git repo-config remote.one.fetch refs/heads/master:refs/heads/one &&
|
||||||
echo "Pull: refs/heads/master:refs/heads/one"
|
|
||||||
} >.git/remotes/one
|
|
||||||
cd .. &&
|
cd .. &&
|
||||||
git clone . three &&
|
git clone . three &&
|
||||||
cd three &&
|
cd three &&
|
||||||
git repo-config branch.master.remote two &&
|
git repo-config branch.master.remote two &&
|
||||||
git repo-config branch.master.merge refs/heads/one &&
|
git repo-config branch.master.merge refs/heads/one &&
|
||||||
|
mkdir -p .git/remotes &&
|
||||||
{
|
{
|
||||||
echo "URL: ../two/.git/"
|
echo "URL: ../two/.git/"
|
||||||
echo "Pull: refs/heads/master:refs/heads/two"
|
echo "Pull: refs/heads/master:refs/heads/two"
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
: this is just to ensure the directory exists.
|
|
Loading…
Reference in a new issue