summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-21 22:57:50 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-21 22:57:50 +0900
commite3c18aa35bf619e36efdea2f495756bcab597b8b (patch)
treec7dfd185793394ca2d1cf5df7ed7eb98ff66e08e /builtin
parentMerge branch 'jk/run-command-notdot' into maint (diff)
parentpack-objects (mingw): initialize `packing_data` mutex in the correct spot (diff)
downloadtgif-e3c18aa35bf619e36efdea2f495756bcab597b8b.tar.xz
Merge branch 'js/pack-objects-mutex-init-fix' into maint
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 d1144a8f7e..29d48f3867 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2299,7 +2299,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);
}