diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-05 22:34:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-05 22:34:59 (GMT) |
| commit | b5c71cc33d8dbd0b95fb05e630fe54f8063467f1 (patch) | |
| tree | be1b8ae4e31a6f6c2ce67bed94ffe77f31d4155c /submodule.c | |
| parent | 7ab963e1225ac8dc378142e8632b4dc94c25b351 (diff) | |
| parent | 0222540827ae7bf6d7be8612b056f267346beddc (diff) | |
| download | git-b5c71cc33d8dbd0b95fb05e630fe54f8063467f1.zip git-b5c71cc33d8dbd0b95fb05e630fe54f8063467f1.tar.gz git-b5c71cc33d8dbd0b95fb05e630fe54f8063467f1.tar.bz2 | |
Merge branch 'es/fetch-show-failed-submodules-atend'
A fetch that is told to recursively fetch updates in submodules
inevitably produces reams of output, and it becomes hard to spot
error messages. The command has been taught to enumerate
submodules that had errors at the end of the operation.
* es/fetch-show-failed-submodules-atend:
fetch: emphasize failure during submodule fetch
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/submodule.c b/submodule.c index 9430db8..5abef19 100644 --- a/submodule.c +++ b/submodule.c @@ -1280,10 +1280,12 @@ struct submodule_parallel_fetch { /* Pending fetches by OIDs */ struct fetch_task **oid_fetch_tasks; int oid_fetch_tasks_nr, oid_fetch_tasks_alloc; + + struct strbuf submodules_with_errors; }; #define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0, \ STRING_LIST_INIT_DUP, \ - NULL, 0, 0} + NULL, 0, 0, STRBUF_INIT} static int get_fetch_recurse_config(const struct submodule *submodule, struct submodule_parallel_fetch *spf) @@ -1547,7 +1549,10 @@ static int fetch_finish(int retvalue, struct strbuf *err, struct string_list_item *it; struct oid_array *commits; - if (retvalue) + if (!task || !task->sub) + BUG("callback cookie bogus"); + + if (retvalue) { /* * NEEDSWORK: This indicates that the overall fetch * failed, even though there may be a subsequent fetch @@ -1557,8 +1562,9 @@ static int fetch_finish(int retvalue, struct strbuf *err, */ spf->result = 1; - if (!task || !task->sub) - BUG("callback cookie bogus"); + strbuf_addf(&spf->submodules_with_errors, "\t%s\n", + task->sub->name); + } /* Is this the second time we process this submodule? */ if (task->commits) @@ -1627,6 +1633,11 @@ int fetch_populated_submodules(struct repository *r, &spf, "submodule", "parallel/fetch"); + if (spf.submodules_with_errors.len > 0) + fprintf(stderr, _("Errors during submodule fetch:\n%s"), + spf.submodules_with_errors.buf); + + argv_array_clear(&spf.args); out: free_submodules_oids(&spf.changed_submodule_names); |