diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:43 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:43 +0900 |
| commit | 620b00e1671a8b4c1b00dbea8a0e81a657f28ce1 (patch) | |
| tree | b337e3557873df338d7f5d172c366eee55f67d8b /pack-objects.c | |
| parent | Merge branch 'tq/branch-style-fix' (diff) | |
| parent | pack-objects (mingw): initialize `packing_data` mutex in the correct spot (diff) | |
| download | tgif-620b00e1671a8b4c1b00dbea8a0e81a657f28ce1.tar.xz | |
Merge branch 'js/pack-objects-mutex-init-fix'
A mutex used in "git pack-objects" were not correctly initialized
and this caused "git repack" to dump core on Windows.
* js/pack-objects-mutex-init-fix:
pack-objects (mingw): initialize `packing_data` mutex in the correct spot
pack-objects (mingw): demonstrate a segmentation fault with large deltas
pack-objects: fix typo 'detla' -> 'delta'
Diffstat (limited to 'pack-objects.c')
| -rw-r--r-- | pack-objects.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pack-objects.c b/pack-objects.c index 7e624c30eb..b6cdbb0166 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -148,6 +148,9 @@ void prepare_packing_data(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 } struct object_entry *packlist_alloc(struct packing_data *pdata, |