From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Oct 2020 04:53:25 +0000 (-0700)
Subject: Merge branch 'jk/index-pack-hotfixes'
X-Git-Tag: v2.29.0-rc1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7ac8c0a7ccba76f082b9fd9c7e35b66209d8bf3;p=thirdparty%2Fgit.git

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
---

c7ac8c0a7ccba76f082b9fd9c7e35b66209d8bf3