diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-05 00:39:17 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-05 00:39:17 +0300 |
| commit | 1e9a4856fb263ad8227456f9ec6b78804afe7cee (patch) | |
| tree | 6936204884014f3912026a66085829e4a65b835f /builtin | |
| parent | 10881f076e19fbd0fa7b753b7c6c8203b419be83 (diff) | |
| parent | eb09121b745e9aa5bbd3fa438f873c3511f48b33 (diff) | |
Merge branch 'sb/submodule-clone-retry'
An earlier tweak to make "submodule update" retry a failing clone
of submodules was buggy and caused segfault, which has been fixed.
* sb/submodule-clone-retry:
submodule-helper: fix indexing in clone retry error reporting path
git-submodule: forward exit code of git-submodule--helper more faithfully
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/submodule--helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index b22352b6e1..6f6d67a469 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -795,7 +795,7 @@ static int update_clone_task_finished(int result, suc->failed_clones[suc->failed_clones_nr++] = ce; return 0; } else { - idx = suc->current - suc->list.nr; + idx -= suc->list.nr; ce = suc->failed_clones[idx]; strbuf_addf(err, _("Failed to clone '%s' a second time, aborting"), ce->name); |