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

Merge branch 'sb/submodule-clone-retry'

Browse Source 
Fix-up to an error codepath in a topic already in 'master'.

* sb/submodule-clone-retry:
  submodule--helper: use parallel processor correctly
This commit is contained in:
Junio C Hamano
2016-08-12 09:47:34 -07:00
parent a42d7b6a5b 2201ee09b5
commit 2f9c615efb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/submodule--helper.c
View File

@ -748,8 +748,12 @@ static int update_clone_get_next_task(struct child_process *child,
if (index < suc->failed_clones_nr) { if (index < suc->failed_clones_nr) {
int *p; int *p;
ce = suc->failed_clones[index]; ce = suc->failed_clones[index];
if (!prepare_to_clone_next_submodule(ce, child, suc, err)) if (!prepare_to_clone_next_submodule(ce, child, suc, err)) {
die("BUG: ce was a submodule before?"); suc->current ++;
strbuf_addf(err, "BUG: submodule considered for cloning,"
"doesn't need cloning any more?\n");
return 0;
}
p = xmalloc(sizeof(*p)); p = xmalloc(sizeof(*p));
*p = suc->current; *p = suc->current;
*idx_task_cb = p; *idx_task_cb = p;