Merge branch 'mb/diff-default-to-indent-heuristics'

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 80439047aa21b9291417cb6ef30164d41878b728..f672225def033595602bc4ff91ee26edd9804944 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2483,8 +2483,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
-               if (delta_search_threads != 1)
+               if (delta_search_threads != 1) {
                        warning("no threads support, ignoring %s", k);
+                       delta_search_threads = 0;
+               }
 #endif
                return 0;
        }