Merge branch 'cw/diff-highlight'

diff --git a/pack-objects.c b/pack-objects.c
index 9c45842df389270baf73f4aa5b65df2004c9ba4d..ce33b8906e5c589813c7d873c9173aa3aa2afddc 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -119,8 +119,7 @@ static void prepare_in_pack_by_idx(struct packing_data *pdata)
  * this fall back code, just stay simple and fall back to using
  * in_pack[] array.
  */
-void oe_map_new_pack(struct packing_data *pack,
-                    struct packed_git *p)
+void oe_map_new_pack(struct packing_data *pack)
 {
        uint32_t i;
 
@@ -150,9 +149,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,