diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-10-05 18:46:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-05 22:35:58 (GMT) |
| commit | d54dea77dba081770fec7707110d8480ccaf9439 (patch) | |
| tree | 71d32c1695cf3ce28fd4090d19e24971db96e491 /Documentation | |
| parent | 67feca3b1c45a51b204253039139b46cc07e145f (diff) | |
| download | git-d54dea77dba081770fec7707110d8480ccaf9439.zip git-d54dea77dba081770fec7707110d8480ccaf9439.tar.gz git-d54dea77dba081770fec7707110d8480ccaf9439.tar.bz2 | |
fetch: let --jobs=<n> parallelize --multiple, too
So far, `--jobs=<n>` only parallelizes submodule fetches/clones, not
`--multiple` fetches, which is unintuitive, given that the option's name
does not say anything about submodules in particular.
Let's change that. With this patch, also fetches from multiple remotes
are parallelized.
For backwards-compatibility (and to prepare for a use case where
submodule and multiple-remote fetches may need different parallelization
limits), the config setting `submodule.fetchJobs` still only controls
the submodule part of `git fetch`, while the newly-introduced setting
`fetch.parallel` controls both (but can be overridden for submodules
with `submodule.fetchJobs`).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/fetch.txt | 10 | ||||
| -rw-r--r-- | Documentation/fetch-options.txt | 13 |
2 files changed, 19 insertions, 4 deletions
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt index ba890b5..b200634 100644 --- a/Documentation/config/fetch.txt +++ b/Documentation/config/fetch.txt @@ -68,3 +68,13 @@ fetch.showForcedUpdates:: Set to false to enable `--no-show-forced-updates` in linkgit:git-fetch[1] and linkgit:git-pull[1] commands. Defaults to true. + +fetch.parallel:: + Specifies the maximal number of fetch operations to be run in parallel + at a time (submodules, or remotes when the `--multiple` option of + linkgit:git-fetch[1] is in effect). ++ +A value of 0 will give some reasonable default. If unset, it defaults to 1. ++ +For submodules, this setting can be overridden using the `submodule.fetchJobs` +config setting. diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 3c9b4f9..8f269d3 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -160,10 +160,15 @@ ifndef::git-pull[] -j:: --jobs=<n>:: - Number of parallel children to be used for fetching submodules. - Each will fetch from different submodules, such that fetching many - submodules will be faster. By default submodules will be fetched - one at a time. + Number of parallel children to be used for all forms of fetching. ++ +If the `--multiple` option was specified, the different remotes will be fetched +in parallel. If multiple submodules are fetched, they will be fetched in +parallel. To control them independently, use the config settings +`fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1]). ++ +Typically, parallel recursive and multi-remote fetches will be faster. By +default fetches are performed sequentially, not in parallel. --no-recurse-submodules:: Disable recursive fetching of submodules (this has the same effect as |