dc5d40f5bc
When running 'read-tree' with a single tree and no prefix,
'prime_cache_tree()' is called after the tree is unpacked. In that
situation, skip a redundant call to 'cache_tree_update()' in
'unpack_trees()' by enabling the 'skip_cache_tree_update' unpack option.
Removing the redundant cache tree update provides a substantial performance
improvement to 'git read-tree <tree-ish>', as shown by a test added to
'p0006-read-tree-checkout.sh':
Test before after
----------------------------------------------------------------------
read-tree br_ballast_plus_1 3.94(1.80+1.57) 3.00(1.14+1.28) -23.9%
Note that the 'read-tree' in 't1022-read-tree-partial-clone.sh' is updated
to read two trees, rather than one. The test was first introduced in
d3da223f22 (cache-tree: prefetch in partial clone read-tree, 2021-07-23) to
exercise the 'cache_tree_update()' code path, as used in 'git merge'. Since
this patch drops the call to 'cache_tree_update()' in single-tree 'git
read-tree', change the test to use the two-tree variant so that
'cache_tree_update()' is called as intended.
Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
31 lines
854 B
Bash
Executable File
31 lines
854 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git read-tree in partial clones'
|
|
|
|
TEST_NO_CREATE_REPO=1
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'read-tree in partial clone prefetches in one batch' '
|
|
test_when_finished "rm -rf server client trace" &&
|
|
|
|
git init server &&
|
|
echo foo >server/one &&
|
|
echo bar >server/two &&
|
|
git -C server add one two &&
|
|
git -C server commit -m "initial commit" &&
|
|
TREE=$(git -C server rev-parse HEAD^{tree}) &&
|
|
|
|
git -C server config uploadpack.allowfilter 1 &&
|
|
git -C server config uploadpack.allowanysha1inwant 1 &&
|
|
git clone --bare --filter=blob:none "file://$(pwd)/server" client &&
|
|
GIT_TRACE_PACKET="$(pwd)/trace" git -C client read-tree $TREE $TREE &&
|
|
|
|
# "done" marks the end of negotiation (once per fetch). Expect that
|
|
# only one fetch occurs.
|
|
grep "fetch> done" trace >donelines &&
|
|
test_line_count = 1 donelines
|
|
'
|
|
|
|
test_done
|