mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "submodules: fix of regression on fetching of non-init subsub-repo"

Browse Source 
This reverts commit 1b7ac4e6d4d490b224f5206af7418ed74e490608; in
<CAN0XMOLiS_8JZKF_wW70BvRRxkDHyUoa=Z3ODtB_Bd6f5Y=7JQ@mail.gmail.com>,
Ralf Thielow reports that "git fetch" with submodule.recurse set can
result in a bogus and infinitely recursive fetching of the same
submodule.
This commit is contained in:
Junio C Hamano
2020-12-02 15:07:14 -08:00
parent 1b7ac4e6d4
commit 7091499bc0
2 changed files with 10 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
submodule.c
View File

@ -499,6 +499,12 @@ void prepare_submodule_repo_env(struct strvec *out)
DEFAULT_GIT_DIR_ENVIRONMENT);
}
static void prepare_submodule_repo_env_in_gitdir(struct strvec *out)
{
prepare_submodule_repo_env_no_git_dir(out);
strvec_pushf(out, "%s=.", GIT_DIR_ENVIRONMENT);
}
/*
* Initialize a repository struct for a submodule based on the provided 'path'.
*
@ -1449,8 +1455,8 @@ static int get_next_submodule(struct child_process *cp,
if (task->repo) {
struct strbuf submodule_prefix = STRBUF_INIT;
child_process_init(cp);
cp->dir = task->repo->worktree;
prepare_submodule_repo_env(&cp->env_array);
cp->dir = task->repo->gitdir;
prepare_submodule_repo_env_in_gitdir(&cp->env_array);
cp->git_cmd = 1;
if (!spf->quiet)
strbuf_addf(err, _("Fetching submodule %s%s\n"),
@ -1499,9 +1505,9 @@ static int get_next_submodule(struct child_process *cp,
spf->prefix, task->sub->path);
child_process_init(cp);
prepare_submodule_repo_env(&cp->env_array);
prepare_submodule_repo_env_in_gitdir(&cp->env_array);
cp->git_cmd = 1;
cp->dir = task->repo->worktree;
cp->dir = task->repo->gitdir;
strvec_init(&cp->args);
strvec_pushv(&cp->args, spf->args.v);