diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-05 23:26:16 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-05 23:26:16 +0100 |
| commit | d243a323a545da68b87149e885f2e440f0b13725 (patch) | |
| tree | 8d751162703b347ea59c34bee23e13470a9e93d0 /pack-objects.c | |
| parent | Merge branch 'jk/attr-macro-fix' (diff) | |
| parent | pack-objects: merge read_lock and lock in packing_data struct (diff) | |
| download | git-d243a323a545da68b87149e885f2e440f0b13725.tar.xz git-d243a323a545da68b87149e885f2e440f0b13725.zip | |
Merge branch 'ph/pack-objects-mutex-fix'
"git pack-objects" incorrectly used uninitialized mutex, which has
been corrected.
* ph/pack-objects-mutex-fix:
pack-objects: merge read_lock and lock in packing_data struct
pack-objects: move read mutex to packing_data struct
Diffstat (limited to 'pack-objects.c')
| -rw-r--r-- | pack-objects.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pack-objects.c b/pack-objects.c index 9c45842df3..e7cd337bee 100644 --- 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, |