From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Mar 2022 00:53:08 +0000 (-0700)
Subject: Merge branch 'vd/sparse-read-tree'
X-Git-Tag: v2.36.0-rc0~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=190f9bf62a17ca6f97dee3f3818450ab2927215b;p=thirdparty%2Fgit.git

Merge branch 'vd/sparse-read-tree'

"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
---

190f9bf62a17ca6f97dee3f3818450ab2927215b