diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-16 17:53:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-16 17:53:08 -0700 |
| commit | 190f9bf62a17ca6f97dee3f3818450ab2927215b (patch) | |
| tree | 9535db8aff0d4abc101106628ab25be60aa7ac07 /t/perf | |
| parent | 430883a70c79614e52279f2800a9a383ffc68fe5 (diff) | |
| parent | f27c170f645e6b8ed642c49c503964893ee26a4f (diff) | |
| download | git-190f9bf62a17ca6f97dee3f3818450ab2927215b.tar.gz | |
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
Diffstat (limited to 't/perf')
| -rwxr-xr-x | t/perf/p2000-sparse-operations.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/perf/p2000-sparse-operations.sh b/t/perf/p2000-sparse-operations.sh index 2a7106b949..382716cfca 100755 --- a/t/perf/p2000-sparse-operations.sh +++ b/t/perf/p2000-sparse-operations.sh @@ -117,6 +117,7 @@ test_perf_on_all git diff test_perf_on_all git diff --cached test_perf_on_all git blame $SPARSE_CONE/a test_perf_on_all git blame $SPARSE_CONE/f3/a +test_perf_on_all git read-tree -mu HEAD test_perf_on_all git checkout-index -f --all test_perf_on_all git update-index --add --remove $SPARSE_CONE/a |