mirror of
https://github.com/git/git
synced 2024-07-17 02:57:48 +00:00
fa655d8411
Skip merging the commit, updating the index and working directory if and only if we are creating a new branch via "git checkout -b <new_branch>." Any other checkout options will still go through the former code path. If sparse_checkout is on, require the user to manually opt in to this optimzed behavior by setting the config setting checkout.optimizeNewBranch to true as we will no longer update the skip-worktree bit in the index, nor add/remove files in the working directory to reflect the current sparse checkout settings. For comparison, running "git checkout -b <new_branch>" on a large repo takes: 14.6 seconds - without this patch 0.3 seconds - with this patch Signed-off-by: Ben Peart <Ben.Peart@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
67 lines
1.7 KiB
Bash
Executable file
67 lines
1.7 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_done
|