Skip to content

Commit c39952b

Browse files
rimrulgitster
authored andcommitted
fetch: choose a sensible default with --jobs=0 again
prior to 51243f9 (run-command API: don't fall back on online_cpus(), 2022-10-12) `git fetch --multiple --jobs=0` would choose some default amount of jobs, similar to `git -c fetch.parallel=0 fetch --multiple`. While our documentation only ever promised that `fetch.parallel` would fall back to a "sensible default", it makes sense to do the same for `--jobs`. So fall back to online_cpus() and not BUG() out. This fixes #4302 Reported-by: Drew Noakes <[email protected]> Signed-off-by: Matthias Aßhauer <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d9d677b commit c39952b

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

builtin/fetch.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2196,6 +2196,9 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
21962196
if (dry_run)
21972197
write_fetch_head = 0;
21982198

2199+
if (!max_jobs)
2200+
max_jobs = online_cpus();
2201+
21992202
if (!git_config_get_string_tmp("fetch.bundleuri", &bundle_uri) &&
22002203
fetch_bundle_uri(the_repository, bundle_uri, NULL))
22012204
warning(_("failed to fetch bundles from '%s'"), bundle_uri);

t/t5514-fetch-multiple.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,4 +197,9 @@ test_expect_success 'parallel' '
197197
test_i18ngrep "could not fetch .two.*128" err
198198
'
199199

200+
test_expect_success 'git fetch --multiple --jobs=0 picks a default' '
201+
(cd test &&
202+
git fetch --multiple --jobs=0)
203+
'
204+
200205
test_done

0 commit comments

Comments
 (0)