Merge branch 'ds/commit-and-checkout-with-sparse-index'
commit506d2a354a9b24c531634094292b11ed8b8c2514
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Aug 2021 20:28:53 +0000 (4 13:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Aug 2021 20:28:53 +0000 (4 13:28 -0700)
tree2324d28eddd75395949471683f6eeec9781d841d
parent58705b490314cb9a6f70916b4b69062b66ca7130
parente05cdb17e89a2d3257533d47350b3138bfce8737
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
builtin/commit.c
cache-tree.c
unpack-trees.c