| commit | 2e96d8154fc072b4778650560acca31a79ef86b0 | |
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
| Thu, 25 May 2017 19:45:33 +0000 (25 19:45 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 26 May 2017 03:52:37 +0000 (26 12:52 +0900) | ||
| tree | 06ba84537afd5b9287f345e57c967bf9fca018f0 | treesnapshot (tar.gz zip) |
| parent | 967a3eaf432db124cabaa4595677063d5b931ff8 | commitdiff |
pack-objects: fix buggy warning about threads
Fix a buggy warning about threads under NO_PTHREADS=YesPlease. Due to
re-using the delta_search_threads variable for both the state of the
"pack.threads" config & the --threads option, setting "pack.threads"
but not supplying --threads would trigger the warning for both
"pack.threads" & --threads.
Solve this bug by resetting the delta_search_threads variable in
git_pack_config(), it might then be set by --threads again and be
subsequently warned about, as the test I'm changing here asserts.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Fix a buggy warning about threads under NO_PTHREADS=YesPlease. Due to
re-using the delta_search_threads variable for both the state of the
"pack.threads" config & the --threads option, setting "pack.threads"
but not supplying --threads would trigger the warning for both
"pack.threads" & --threads.
Solve this bug by resetting the delta_search_threads variable in
git_pack_config(), it might then be set by --threads again and be
subsequently warned about, as the test I'm changing here asserts.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/pack-objects.c | diffblobblamehistory | |
| t/t5300-pack-object.sh | diffblobblamehistory |