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>

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 0fe35d1b5aebd74116d66d5414bdabf19baf7d97..f1baf05dfe31dc9bbb91c1b6ff44c123fa1b3d38 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2472,8 +2472,10 @@ static int git_pack_config(const char *k, const char *v, void *cb)
                        die("invalid number of threads specified (%d)",
                            delta_search_threads);
 #ifdef NO_PTHREADS
                        die("invalid number of threads specified (%d)",
                            delta_search_threads);
 #ifdef NO_PTHREADS

-               if (delta_search_threads != 1)
+               if (delta_search_threads != 1) {

                        warning("no threads support, ignoring %s", k);
                        warning("no threads support, ignoring %s", k);

+                       delta_search_threads = 0;
+               }

 #endif
                return 0;
        }
 #endif
                return 0;
        }

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 6ed23ee1d209bfa2bf4c607907eb35a37b478313..9c68b992511b7098df0570ca37e0add468a8a093 100755 (executable)
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -447,7 +447,7 @@ test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'pack-objects --threads=N or pack.
 
        git -c pack.threads=2 pack-objects --stdout --all </dev/null >/dev/null 2>err &&
        grep ^warning: err >warnings &&
 
        git -c pack.threads=2 pack-objects --stdout --all </dev/null >/dev/null 2>err &&
        grep ^warning: err >warnings &&

-       test_must_fail test_line_count = 1 warnings &&
+       test_line_count = 1 warnings &&

        grep -F "no threads support, ignoring pack.threads" err &&
 
        git -c pack.threads=2 pack-objects --threads=4 --stdout --all </dev/null >/dev/null 2>err &&
        grep -F "no threads support, ignoring pack.threads" err &&
 
        git -c pack.threads=2 pack-objects --threads=4 --stdout --all </dev/null >/dev/null 2>err &&