mirror of
https://github.com/git/git.git
synced 2024-10-31 14:27:54 +01:00
2f215ff10b
In a partial clone, whenever a sparse checkout occurs, the existence of all blobs in the index is verified, whether they are included or excluded by the .git/info/sparse-checkout specification. This significantly degrades performance because a lazy fetch occurs whenever the existence of a missing blob is checked. This is because cache_tree_update() checks the existence of all objects in the index, whether or not CE_SKIP_WORKTREE is set on them. Teach cache_tree_update() to skip checking CE_SKIP_WORKTREE objects when the repository is a partial clone. This improves performance for sparse checkout and also other operations that use cache_tree_update(). Instead of completely removing the check, an argument could be made that the check should instead be replaced by a check that the blob is promised, but for performance reasons, I decided not to do this. If the user needs to verify the repository, it can be done using fsck (which will notify if a tree points to a missing and non-promised blob, whether the blob is included or excluded by the sparse-checkout specification). Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
99 lines
2.6 KiB
Bash
Executable file
99 lines
2.6 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='sparse checkout scope tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
echo "initial" >a &&
|
|
echo "initial" >b &&
|
|
echo "initial" >c &&
|
|
git add a b c &&
|
|
git commit -m "initial commit"
|
|
'
|
|
|
|
test_expect_success 'create feature branch' '
|
|
git checkout -b feature &&
|
|
echo "modified" >b &&
|
|
echo "modified" >c &&
|
|
git add b c &&
|
|
git commit -m "modification"
|
|
'
|
|
|
|
test_expect_success 'perform sparse checkout of master' '
|
|
git config --local --bool core.sparsecheckout true &&
|
|
echo "!/*" >.git/info/sparse-checkout &&
|
|
echo "/a" >>.git/info/sparse-checkout &&
|
|
echo "/c" >>.git/info/sparse-checkout &&
|
|
git checkout master &&
|
|
test_path_is_file a &&
|
|
test_path_is_missing b &&
|
|
test_path_is_file c
|
|
'
|
|
|
|
test_expect_success 'checkout -b checkout.optimizeNewBranch interaction' '
|
|
cp .git/info/sparse-checkout .git/info/sparse-checkout.bak &&
|
|
test_when_finished "
|
|
mv -f .git/info/sparse-checkout.bak .git/info/sparse-checkout
|
|
git checkout master
|
|
" &&
|
|
echo "/b" >>.git/info/sparse-checkout &&
|
|
test "$(git ls-files -t b)" = "S b" &&
|
|
git -c checkout.optimizeNewBranch=true checkout -b fast &&
|
|
test "$(git ls-files -t b)" = "S b" &&
|
|
git checkout -b slow &&
|
|
test "$(git ls-files -t b)" = "H b"
|
|
'
|
|
|
|
test_expect_success 'merge feature branch into sparse checkout of master' '
|
|
git merge feature &&
|
|
test_path_is_file a &&
|
|
test_path_is_missing b &&
|
|
test_path_is_file c &&
|
|
test "$(cat c)" = "modified"
|
|
'
|
|
|
|
test_expect_success 'return to full checkout of master' '
|
|
git checkout feature &&
|
|
echo "/*" >.git/info/sparse-checkout &&
|
|
git checkout master &&
|
|
test_path_is_file a &&
|
|
test_path_is_file b &&
|
|
test_path_is_file c &&
|
|
test "$(cat b)" = "modified"
|
|
'
|
|
|
|
test_expect_success 'in partial clone, sparse checkout only fetches needed blobs' '
|
|
test_create_repo server &&
|
|
git clone "file://$(pwd)/server" client &&
|
|
|
|
test_config -C server uploadpack.allowfilter 1 &&
|
|
test_config -C server uploadpack.allowanysha1inwant 1 &&
|
|
echo a >server/a &&
|
|
echo bb >server/b &&
|
|
mkdir server/c &&
|
|
echo ccc >server/c/c &&
|
|
git -C server add a b c/c &&
|
|
git -C server commit -m message &&
|
|
|
|
test_config -C client core.sparsecheckout 1 &&
|
|
test_config -C client extensions.partialclone origin &&
|
|
echo "!/*" >client/.git/info/sparse-checkout &&
|
|
echo "/a" >>client/.git/info/sparse-checkout &&
|
|
git -C client fetch --filter=blob:none origin &&
|
|
git -C client checkout FETCH_HEAD &&
|
|
|
|
git -C client rev-list HEAD \
|
|
--quiet --objects --missing=print >unsorted_actual &&
|
|
(
|
|
printf "?" &&
|
|
git hash-object server/b &&
|
|
printf "?" &&
|
|
git hash-object server/c/c
|
|
) >unsorted_expect &&
|
|
sort unsorted_actual >actual &&
|
|
sort unsorted_expect >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|