From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Aug 2021 20:28:53 +0000 (-0700)
Subject: Merge branch 'ds/commit-and-checkout-with-sparse-index'
X-Git-Tag: v2.33.0-rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=506d2a354a9b24c531634094292b11ed8b8c2514;p=thirdparty%2Fgit.git

Merge branch 'ds/commit-and-checkout-with-sparse-index'

"git checkout" and "git commit" learn to work without unnecessarily
expanding sparse indexes.

* ds/commit-and-checkout-with-sparse-index:
  unpack-trees: resolve sparse-directory/file conflicts
  t1092: document bad 'git checkout' behavior
  checkout: stop expanding sparse indexes
  sparse-index: recompute cache-tree
  commit: integrate with sparse-index
  p2000: compress repo names
  p2000: add 'git checkout -' test and decrease depth
---

506d2a354a9b24c531634094292b11ed8b8c2514