Merge branch 'nd/diff-parseopt'

diff --git a/pack-objects.c b/pack-objects.c
index 9c45842df389270baf73f4aa5b65df2004c9ba4d..e7cd337bee53cb02282a14c8aa88f2342edd2eb2 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -150,9 +150,7 @@ void prepare_packing_data(struct repository *r, struct packing_data *pdata)
                                             1U << OE_SIZE_BITS);
        pdata->oe_delta_size_limit = git_env_ulong("GIT_TEST_OE_DELTA_SIZE",
                                                   1UL << OE_DELTA_SIZE_BITS);
-#ifndef NO_PTHREADS
-       pthread_mutex_init(&pdata->lock, NULL);
-#endif
+       init_recursive_mutex(&pdata->odb_lock);
 }
 
 struct object_entry *packlist_alloc(struct packing_data *pdata,