Skip to content

Commit 6e21017

Browse files
Cheskaqiqigitster
authored andcommitted
t1092: update a write-tree test
* 'on all' in the title of the test 'write-tree on all' was unclear; remove it. * Add a baseline 'test_all_match git write-tree' before making any changes to the index, providing a reference point for the 'write-tree' prior to any modifications. * Add a comparison of the output of 'git status --porcelain=v2' to test the working tree after 'write-tree' exits. * Ensure SKIP_WORKTREE files weren't materialized on disk by using "test_path_is_missing". Signed-off-by: Shuqi Liang <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7580f92 commit 6e21017

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

t/t1092-sparse-checkout-compatibility.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2080,22 +2080,32 @@ test_expect_success 'grep sparse directory within submodules' '
20802080
test_cmp actual expect
20812081
'
20822082

2083-
test_expect_success 'write-tree on all' '
2083+
test_expect_success 'write-tree' '
20842084
init_repos &&
20852085
2086+
test_all_match git write-tree &&
2087+
20862088
write_script edit-contents <<-\EOF &&
20872089
echo text >>"$1"
20882090
EOF
20892091
2092+
# make a change inside the sparse cone
20902093
run_on_all ../edit-contents deep/a &&
2091-
run_on_all git update-index deep/a &&
2094+
test_all_match git update-index deep/a &&
20922095
test_all_match git write-tree &&
2096+
test_all_match git status --porcelain=v2 &&
20932097
2098+
# make a change outside the sparse cone
20942099
run_on_all mkdir -p folder1 &&
20952100
run_on_all cp a folder1/a &&
20962101
run_on_all ../edit-contents folder1/a &&
2097-
run_on_all git update-index folder1/a &&
2098-
test_all_match git write-tree
2102+
test_all_match git update-index folder1/a &&
2103+
test_all_match git write-tree &&
2104+
test_all_match git status --porcelain=v2 &&
2105+
2106+
# check that SKIP_WORKTREE files are not materialized
2107+
test_path_is_missing sparse-checkout/folder2/a &&
2108+
test_path_is_missing sparse-index/folder2/a
20992109
'
21002110

21012111
test_expect_success 'sparse-index is not expanded: write-tree' '

0 commit comments

Comments
 (0)