summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-10-30 15:43:43 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-30 15:43:43 +0900
commit620b00e1671a8b4c1b00dbea8a0e81a657f28ce1 (patch)
treeb337e3557873df338d7f5d172c366eee55f67d8b /builtin
parentMerge branch 'tq/branch-style-fix' (diff)
parentpack-objects (mingw): initialize `packing_data` mutex in the correct spot (diff)
downloadtgif-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 'builtin')
-rw-r--r--builtin/pack-objects.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index b059b86aee..e50c6cd1ff 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2399,7 +2399,6 @@ static void init_threaded_search(void)
pthread_mutex_init(&cache_mutex, NULL);
pthread_mutex_init(&progress_mutex, NULL);
pthread_cond_init(&progress_cond, NULL);
- pthread_mutex_init(&to_pack.lock, NULL);
old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
}