]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'vd/sparse-read-tree'
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Mar 2022 00:53:08 +0000 (17:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Mar 2022 00:53:08 +0000 (17:53 -0700)
"git read-tree" has been made to be aware of the sparse-index
feature.

* vd/sparse-read-tree:
  read-tree: make three-way merge sparse-aware
  read-tree: make two-way merge sparse-aware
  read-tree: narrow scope of index expansion for '--prefix'
  read-tree: integrate with sparse index
  read-tree: expand sparse checkout test coverage
  read-tree: explicitly disallow prefixes with a leading '/'
  status: fix nested sparse directory diff in sparse index
  sparse-index: prevent repo root from becoming sparse

1  2 
dir.c
t/t1092-sparse-checkout-compatibility.sh
unpack-trees.c

diff --cc dir.c
Simple merge
diff --cc unpack-trees.c
Simple merge