]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
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

1  2 
builtin/index-pack.c

Simple merge