mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 10:26:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

t1092: add tests for git diff-files

Browse Source 
Before integrating the 'git diff-files' builtin with the sparse index
feature, add tests to t1092-sparse-checkout-compatibility.sh to ensure
it currently works with sparse-checkout and will still work with sparse
index after that integration.

When adding tests against a sparse-checkout definition, we test two
modes: all changes are within the sparse-checkout cone and some changes
are outside the sparse-checkout cone.

In order to have staged changes outside of the sparse-checkout cone,
make a directory called 'folder1' and copy `a` into 'folder1/a'.
'folder1/a' is identical to `a` in the base commit. These make
'folder1/a' in the index, while leaving it outside of the
sparse-checkout definition. Change content inside 'folder1/a' in order
to test 'folder1/a' being present on-disk with modifications.

Signed-off-by: Shuqi Liang <cheskaqiqi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Shuqi Liang 2023-05-09 15:42:40 -04:00 committed by Junio C Hamano
parent 7580f92ffa
commit 0aba1a989c
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
t/t1092-sparse-checkout-compatibility.sh
View File

@ -2108,4 +2108,43 @@ test_expect_success 'sparse-index is not expanded: write-tree' '
ensure_not_expanded write-tree
'
test_expect_success 'diff-files with pathspec inside sparse definition' '
init_repos &&
write_script edit-contents <<-\EOF &&
echo text >>"$1"
EOF
run_on_all ../edit-contents deep/a &&
test_all_match git diff-files &&
test_all_match git diff-files -- deep/a &&
# test wildcard
test_all_match git diff-files -- "deep/*"
'
test_expect_success 'diff-files with pathspec outside sparse definition' '
init_repos &&
test_sparse_match git diff-files -- folder2/a &&
write_script edit-contents <<-\EOF &&
echo text >>"$1"
EOF
# The directory "folder1" is outside the cone of interest
# and will not exist in the sparse checkout repositories.
# Create it as needed, add file "folder1/a" there with
# contents that is different from the staged version.
run_on_all mkdir -p folder1 &&
run_on_all cp a folder1/a &&
run_on_all ../edit-contents folder1/a &&
test_all_match git diff-files &&
test_all_match git diff-files -- folder1/a &&
test_all_match git diff-files -- "folder*/a"
'
test_done