2019-11-22 01:04:33 +03:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='sparse checkout builtin tests'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2019-12-20 22:41:14 +03:00
|
|
|
list_files() {
|
|
|
|
# Do not replace this with 'ls "$1"', as "ls" with BSD-lineage
|
|
|
|
# enables "-A" by default for root and ends up including ".git" and
|
|
|
|
# such in its output. (Note, though, that running the test suite as
|
|
|
|
# root is generally not recommended.)
|
|
|
|
(cd "$1" && printf '%s\n' *)
|
|
|
|
}
|
|
|
|
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files() {
|
|
|
|
list_files "$1" >actual &&
|
|
|
|
shift &&
|
|
|
|
printf "%s\n" $@ >expect &&
|
|
|
|
test_cmp expect actual
|
|
|
|
}
|
|
|
|
|
2019-11-22 01:04:33 +03:00
|
|
|
test_expect_success 'setup' '
|
|
|
|
git init repo &&
|
|
|
|
(
|
|
|
|
cd repo &&
|
|
|
|
echo "initial" >a &&
|
|
|
|
mkdir folder1 folder2 deep &&
|
|
|
|
mkdir deep/deeper1 deep/deeper2 &&
|
|
|
|
mkdir deep/deeper1/deepest &&
|
|
|
|
cp a folder1 &&
|
|
|
|
cp a folder2 &&
|
|
|
|
cp a deep &&
|
|
|
|
cp a deep/deeper1 &&
|
|
|
|
cp a deep/deeper2 &&
|
|
|
|
cp a deep/deeper1/deepest &&
|
|
|
|
git add . &&
|
|
|
|
git commit -m "initial commit"
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git sparse-checkout list (empty)' '
|
|
|
|
git -C repo sparse-checkout list >list 2>err &&
|
|
|
|
test_must_be_empty list &&
|
|
|
|
test_i18ngrep "this worktree is not sparse (sparse-checkout file may not exist)" err
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git sparse-checkout list (populated)' '
|
|
|
|
test_when_finished rm -f repo/.git/info/sparse-checkout &&
|
|
|
|
cat >repo/.git/info/sparse-checkout <<-EOF &&
|
|
|
|
/folder1/*
|
|
|
|
/deep/
|
|
|
|
**/a
|
|
|
|
!*bin*
|
|
|
|
EOF
|
|
|
|
cp repo/.git/info/sparse-checkout expect &&
|
|
|
|
git -C repo sparse-checkout list >list &&
|
|
|
|
test_cmp expect list
|
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:34 +03:00
|
|
|
test_expect_success 'git sparse-checkout init' '
|
|
|
|
git -C repo sparse-checkout init &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
/*
|
|
|
|
!/*/
|
|
|
|
EOF
|
|
|
|
test_cmp expect repo/.git/info/sparse-checkout &&
|
|
|
|
test_cmp_config -C repo true core.sparsecheckout &&
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files repo a
|
2019-11-22 01:04:34 +03:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git sparse-checkout list after init' '
|
|
|
|
git -C repo sparse-checkout list >actual &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
/*
|
|
|
|
!/*/
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'init with existing sparse-checkout' '
|
|
|
|
echo "*folder*" >> repo/.git/info/sparse-checkout &&
|
|
|
|
git -C repo sparse-checkout init &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
/*
|
|
|
|
!/*/
|
|
|
|
*folder*
|
|
|
|
EOF
|
|
|
|
test_cmp expect repo/.git/info/sparse-checkout &&
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files repo a folder1 folder2
|
2019-11-22 01:04:34 +03:00
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:35 +03:00
|
|
|
test_expect_success 'clone --sparse' '
|
|
|
|
git clone --sparse repo clone &&
|
|
|
|
git -C clone sparse-checkout list >actual &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
/*
|
|
|
|
!/*/
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual &&
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files clone a
|
2019-11-22 01:04:35 +03:00
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:36 +03:00
|
|
|
test_expect_success 'set enables config' '
|
|
|
|
git init empty-config &&
|
|
|
|
(
|
|
|
|
cd empty-config &&
|
|
|
|
test_commit test file &&
|
|
|
|
test_path_is_missing .git/config.worktree &&
|
|
|
|
test_must_fail git sparse-checkout set nothing &&
|
|
|
|
test_path_is_file .git/config.worktree &&
|
|
|
|
test_must_fail git config core.sparseCheckout &&
|
|
|
|
git sparse-checkout set "/*" &&
|
|
|
|
test_cmp_config true core.sparseCheckout
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'set sparse-checkout using builtin' '
|
|
|
|
git -C repo sparse-checkout set "/*" "!/*/" "*folder*" &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
/*
|
|
|
|
!/*/
|
|
|
|
*folder*
|
|
|
|
EOF
|
|
|
|
git -C repo sparse-checkout list >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
test_cmp expect repo/.git/info/sparse-checkout &&
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files repo a folder1 folder2
|
2019-11-22 01:04:36 +03:00
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:37 +03:00
|
|
|
test_expect_success 'set sparse-checkout using --stdin' '
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
/*
|
|
|
|
!/*/
|
|
|
|
/folder1/
|
|
|
|
/folder2/
|
|
|
|
EOF
|
|
|
|
git -C repo sparse-checkout set --stdin <expect &&
|
|
|
|
git -C repo sparse-checkout list >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
test_cmp expect repo/.git/info/sparse-checkout &&
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files repo "a folder1 folder2"
|
2019-11-22 01:04:37 +03:00
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:40 +03:00
|
|
|
test_expect_success 'cone mode: match patterns' '
|
|
|
|
git -C repo config --worktree core.sparseCheckoutCone true &&
|
|
|
|
rm -rf repo/a repo/folder1 repo/folder2 &&
|
2019-11-22 01:04:41 +03:00
|
|
|
git -C repo read-tree -mu HEAD 2>err &&
|
|
|
|
test_i18ngrep ! "disabling cone patterns" err &&
|
2019-11-22 01:04:40 +03:00
|
|
|
git -C repo reset --hard &&
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files repo a folder1 folder2
|
2019-11-22 01:04:40 +03:00
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:41 +03:00
|
|
|
test_expect_success 'cone mode: warn on bad pattern' '
|
|
|
|
test_when_finished mv sparse-checkout repo/.git/info/ &&
|
|
|
|
cp repo/.git/info/sparse-checkout . &&
|
|
|
|
echo "!/deep/deeper/*" >>repo/.git/info/sparse-checkout &&
|
|
|
|
git -C repo read-tree -mu HEAD 2>err &&
|
|
|
|
test_i18ngrep "unrecognized negative pattern" err
|
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:38 +03:00
|
|
|
test_expect_success 'sparse-checkout disable' '
|
2019-11-22 01:04:47 +03:00
|
|
|
test_when_finished rm -rf repo/.git/info/sparse-checkout &&
|
2019-11-22 01:04:38 +03:00
|
|
|
git -C repo sparse-checkout disable &&
|
2019-11-22 01:04:47 +03:00
|
|
|
test_path_is_file repo/.git/info/sparse-checkout &&
|
2019-11-22 01:04:38 +03:00
|
|
|
git -C repo config --list >config &&
|
|
|
|
test_must_fail git config core.sparseCheckout &&
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files repo a deep folder1 folder2
|
2019-11-22 01:04:38 +03:00
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:42 +03:00
|
|
|
test_expect_success 'cone mode: init and set' '
|
|
|
|
git -C repo sparse-checkout init --cone &&
|
|
|
|
git -C repo config --list >config &&
|
|
|
|
test_i18ngrep "core.sparsecheckoutcone=true" config &&
|
2019-12-20 22:41:14 +03:00
|
|
|
list_files repo >dir &&
|
2019-11-22 01:04:42 +03:00
|
|
|
echo a >expect &&
|
|
|
|
test_cmp expect dir &&
|
|
|
|
git -C repo sparse-checkout set deep/deeper1/deepest/ 2>err &&
|
|
|
|
test_must_be_empty err &&
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files repo a deep &&
|
|
|
|
check_files repo/deep a deeper1 &&
|
|
|
|
check_files repo/deep/deeper1 a deepest &&
|
2019-11-22 01:04:42 +03:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
/*
|
|
|
|
!/*/
|
|
|
|
/deep/
|
|
|
|
!/deep/*/
|
|
|
|
/deep/deeper1/
|
|
|
|
!/deep/deeper1/*/
|
|
|
|
/deep/deeper1/deepest/
|
|
|
|
EOF
|
|
|
|
test_cmp expect repo/.git/info/sparse-checkout &&
|
|
|
|
git -C repo sparse-checkout set --stdin 2>err <<-EOF &&
|
|
|
|
folder1
|
|
|
|
folder2
|
|
|
|
EOF
|
|
|
|
test_must_be_empty err &&
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files repo a folder1 folder2
|
2019-11-22 01:04:42 +03:00
|
|
|
'
|
|
|
|
|
2019-12-30 18:33:12 +03:00
|
|
|
test_expect_success 'cone mode: list' '
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
folder1
|
|
|
|
folder2
|
|
|
|
EOF
|
|
|
|
git -C repo sparse-checkout set --stdin <expect &&
|
|
|
|
git -C repo sparse-checkout list >actual 2>err &&
|
|
|
|
test_must_be_empty err &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:45 +03:00
|
|
|
test_expect_success 'cone mode: set with nested folders' '
|
|
|
|
git -C repo sparse-checkout set deep deep/deeper1/deepest 2>err &&
|
|
|
|
test_line_count = 0 err &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
/*
|
|
|
|
!/*/
|
|
|
|
/deep/
|
|
|
|
EOF
|
|
|
|
test_cmp repo/.git/info/sparse-checkout expect
|
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:46 +03:00
|
|
|
test_expect_success 'revert to old sparse-checkout on bad update' '
|
2019-11-22 01:04:51 +03:00
|
|
|
test_when_finished git -C repo reset --hard &&
|
2019-11-22 01:04:46 +03:00
|
|
|
echo update >repo/deep/deeper2/a &&
|
|
|
|
cp repo/.git/info/sparse-checkout expect &&
|
|
|
|
test_must_fail git -C repo sparse-checkout set deep/deeper1 2>err &&
|
2019-11-22 01:04:51 +03:00
|
|
|
test_i18ngrep "cannot set sparse-checkout patterns" err &&
|
2019-11-22 01:04:46 +03:00
|
|
|
test_cmp repo/.git/info/sparse-checkout expect &&
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files repo/deep a deeper1 deeper2
|
2019-11-22 01:04:46 +03:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'revert to old sparse-checkout on empty update' '
|
|
|
|
git init empty-test &&
|
|
|
|
(
|
|
|
|
echo >file &&
|
|
|
|
git add file &&
|
|
|
|
git commit -m "test" &&
|
|
|
|
test_must_fail git sparse-checkout set nothing 2>err &&
|
|
|
|
test_i18ngrep "Sparse checkout leaves no entry on working directory" err &&
|
|
|
|
test_i18ngrep ! ".git/index.lock" err &&
|
|
|
|
git sparse-checkout set file
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:48 +03:00
|
|
|
test_expect_success 'fail when lock is taken' '
|
|
|
|
test_when_finished rm -rf repo/.git/info/sparse-checkout.lock &&
|
|
|
|
touch repo/.git/info/sparse-checkout.lock &&
|
|
|
|
test_must_fail git -C repo sparse-checkout set deep 2>err &&
|
|
|
|
test_i18ngrep "File exists" err
|
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:49 +03:00
|
|
|
test_expect_success '.gitignore should not warn about cone mode' '
|
|
|
|
git -C repo config --worktree core.sparseCheckoutCone true &&
|
|
|
|
echo "**/bin/*" >repo/.gitignore &&
|
|
|
|
git -C repo reset --hard 2>err &&
|
|
|
|
test_i18ngrep ! "disabling cone patterns" err
|
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:51 +03:00
|
|
|
test_expect_success 'sparse-checkout (init|set|disable) fails with dirty status' '
|
|
|
|
git clone repo dirty &&
|
|
|
|
echo dirty >dirty/folder1/a &&
|
|
|
|
test_must_fail git -C dirty sparse-checkout init &&
|
|
|
|
test_must_fail git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* &&
|
|
|
|
test_must_fail git -C dirty sparse-checkout disable &&
|
|
|
|
git -C dirty reset --hard &&
|
|
|
|
git -C dirty sparse-checkout init &&
|
|
|
|
git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* &&
|
|
|
|
git -C dirty sparse-checkout disable
|
|
|
|
'
|
|
|
|
|
sparse-checkout: respect core.ignoreCase in cone mode
When a user uses the sparse-checkout feature in cone mode, they
add patterns using "git sparse-checkout set <dir1> <dir2> ..."
or by using "--stdin" to provide the directories line-by-line over
stdin. This behaviour naturally looks a lot like the way a user
would type "git add <dir1> <dir2> ..."
If core.ignoreCase is enabled, then "git add" will match the input
using a case-insensitive match. Do the same for the sparse-checkout
feature.
Perform case-insensitive checks while updating the skip-worktree
bits during unpack_trees(). This is done by changing the hash
algorithm and hashmap comparison methods to optionally use case-
insensitive methods.
When this is enabled, there is a small performance cost in the
hashing algorithm. To tease out the worst possible case, the
following was run on a repo with a deep directory structure:
git ls-tree -d -r --name-only HEAD |
git sparse-checkout set --stdin
The 'set' command was timed with core.ignoreCase disabled or
enabled. For the repo with a deep history, the numbers were
core.ignoreCase=false: 62s
core.ignoreCase=true: 74s (+19.3%)
For reproducibility, the equivalent test on the Linux kernel
repository had these numbers:
core.ignoreCase=false: 3.1s
core.ignoreCase=true: 3.6s (+16%)
Now, this is not an entirely fair comparison, as most users
will define their sparse cone using more shallow directories,
and the performance improvement from eb42feca97 ("unpack-trees:
hash less in cone mode" 2019-11-21) can remove most of the
hash cost. For a more realistic test, drop the "-r" from the
ls-tree command to store only the first-level directories.
In that case, the Linux kernel repository takes 0.2-0.25s in
each case, and the deep repository takes one second, plus or
minus 0.05s, in each case.
Thus, we _can_ demonstrate a cost to this change, but it is
unlikely to matter to any reasonable sparse-checkout cone.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-12-13 21:09:53 +03:00
|
|
|
test_expect_success 'cone mode: set with core.ignoreCase=true' '
|
|
|
|
git -C repo sparse-checkout init --cone &&
|
|
|
|
git -C repo -c core.ignoreCase=true sparse-checkout set folder1 &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
/*
|
|
|
|
!/*/
|
|
|
|
/folder1/
|
|
|
|
EOF
|
|
|
|
test_cmp expect repo/.git/info/sparse-checkout &&
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files repo a folder1
|
sparse-checkout: respect core.ignoreCase in cone mode
When a user uses the sparse-checkout feature in cone mode, they
add patterns using "git sparse-checkout set <dir1> <dir2> ..."
or by using "--stdin" to provide the directories line-by-line over
stdin. This behaviour naturally looks a lot like the way a user
would type "git add <dir1> <dir2> ..."
If core.ignoreCase is enabled, then "git add" will match the input
using a case-insensitive match. Do the same for the sparse-checkout
feature.
Perform case-insensitive checks while updating the skip-worktree
bits during unpack_trees(). This is done by changing the hash
algorithm and hashmap comparison methods to optionally use case-
insensitive methods.
When this is enabled, there is a small performance cost in the
hashing algorithm. To tease out the worst possible case, the
following was run on a repo with a deep directory structure:
git ls-tree -d -r --name-only HEAD |
git sparse-checkout set --stdin
The 'set' command was timed with core.ignoreCase disabled or
enabled. For the repo with a deep history, the numbers were
core.ignoreCase=false: 62s
core.ignoreCase=true: 74s (+19.3%)
For reproducibility, the equivalent test on the Linux kernel
repository had these numbers:
core.ignoreCase=false: 3.1s
core.ignoreCase=true: 3.6s (+16%)
Now, this is not an entirely fair comparison, as most users
will define their sparse cone using more shallow directories,
and the performance improvement from eb42feca97 ("unpack-trees:
hash less in cone mode" 2019-11-21) can remove most of the
hash cost. For a more realistic test, drop the "-r" from the
ls-tree command to store only the first-level directories.
In that case, the Linux kernel repository takes 0.2-0.25s in
each case, and the deep repository takes one second, plus or
minus 0.05s, in each case.
Thus, we _can_ demonstrate a cost to this change, but it is
unlikely to matter to any reasonable sparse-checkout cone.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-12-13 21:09:53 +03:00
|
|
|
'
|
|
|
|
|
2019-12-30 18:33:13 +03:00
|
|
|
test_expect_success 'interaction with submodules' '
|
|
|
|
git clone repo super &&
|
|
|
|
(
|
|
|
|
cd super &&
|
|
|
|
mkdir modules &&
|
|
|
|
git submodule add ../repo modules/child &&
|
|
|
|
git add . &&
|
|
|
|
git commit -m "add submodule" &&
|
|
|
|
git sparse-checkout init --cone &&
|
|
|
|
git sparse-checkout set folder1
|
|
|
|
) &&
|
2020-01-25 00:19:31 +03:00
|
|
|
check_files super a folder1 modules &&
|
|
|
|
check_files super/modules/child a deep folder1 folder2
|
2019-12-30 18:33:13 +03:00
|
|
|
'
|
|
|
|
|
2019-11-22 01:04:33 +03:00
|
|
|
test_done
|