From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Mar 2022 19:22:02 +0000 (-0700)
Subject: Merge branch 'vd/cache-bottom-fix'
X-Git-Tag: v2.36.0-rc0~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d62966735d0f2c9a632d34023336bc0387a4bd5a;p=thirdparty%2Fgit.git

Merge branch 'vd/cache-bottom-fix'

Correct a bug in unpack-trees introduced earlier.

* vd/cache-bottom-fix:
  Revert "unpack-trees: improve performance of next_cache_entry"
  unpack-trees: increment cache_bottom for sparse directories
  t1092: add sparse directory before cone in test repo
---

d62966735d0f2c9a632d34023336bc0387a4bd5a