aboutsummaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-18 12:48:10 -0700
committerJunio C Hamano <gitster@pobox.com>2017-07-18 12:48:10 -0700
commit764046f6b0ea8480ef7f79dd2b9c48cab0c32d22 (patch)
tree93ed2ebca9705953bfee7f6238c93463893a880a /notes-merge.c
parent11157492230874c0c2f36481e75f08406c4ed6e7 (diff)
parentc45af94dbc960cbb46ac482ec9cb7f73f55ea270 (diff)
downloadgit-764046f6b0ea8480ef7f79dd2b9c48cab0c32d22.tar.gz
git-764046f6b0ea8480ef7f79dd2b9c48cab0c32d22.tar.xz
Merge branch 'jk/gc-pre-detach-under-hook'
We run an early part of "git gc" that deals with refs before daemonising (and not under lock) even when running a background auto-gc, which caused multiple gc processes attempting to run the early part at the same time. This is now prevented by running the early part also under the GC lock. * jk/gc-pre-detach-under-hook: gc: run pre-detach operations under lock
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions