tree 78b36cf20a92eb637f6a2d5be57c53bcde7818cd
parent abac91e3aa0fffb5901498923e79d4bcbdb96c46
parent ec6a8f9705cb61956f7fac61a4c0e27d9ae4bbd5
author Junio C Hamano <gitster@pobox.com> 1602219205 -0700
committer Junio C Hamano <gitster@pobox.com> 1602219206 -0700

Merge branch 'jk/index-pack-hotfixes'

Hotfix and clean-up for the jt/threaded-index-pack topic that has
graduated to v2.29-rc0.

* jk/index-pack-hotfixes:
  index-pack: make get_base_data() comment clearer
  index-pack: drop type_cas mutex
  index-pack: restore "resolving deltas" progress meter