Merge branch 'jk/index-pack-hotfixes'
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Oct 2020 04:53:25 +0000 (21:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Oct 2020 04:53:26 +0000 (21:53 -0700)
commitc7ac8c0a7ccba76f082b9fd9c7e35b66209d8bf3
tree78b36cf20a92eb637f6a2d5be57c53bcde7818cd
parentabac91e3aa0fffb5901498923e79d4bcbdb96c46
parentec6a8f9705cb61956f7fac61a4c0e27d9ae4bbd5
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
builtin/index-pack.c