X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-pack-objects.c;h=4c91e944c21df3d5e02535115cdd6098ee49d86d;hb=92396402e2d547f8805dc24db53a4c725796810e;hp=02f9246cdb29903e9d7aafe47604f6882a3e7f86;hpb=6e4ece61ff9c4c0a0c7eac43fca74ca1b5548e98;p=git.git diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 02f9246cd..4c91e944c 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1629,6 +1629,8 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size, struct thread_params *p; int i, ret, active_threads = 0; + if (!delta_search_threads) /* --threads=0 means autodetect */ + delta_search_threads = online_cpus(); if (delta_search_threads <= 1) { find_deltas(list, &list_size, window, depth, processed); return; @@ -2324,11 +2326,6 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) if (keep_unreachable && unpack_unreachable) die("--keep-unreachable and --unpack-unreachable are incompatible."); -#ifdef THREADED_DELTA_SEARCH - if (!delta_search_threads) /* --threads=0 means autodetect */ - delta_search_threads = online_cpus(); -#endif - prepare_packed_git(); if (progress)