diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-05-24 23:53:55 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-05-24 23:53:55 +0300 |
commit | 6a6621fe9a226f15f3107fd559928e9b78b51cc2 (patch) | |
tree | 8af4ef8e1862d35240371fc1099df06a788e86f6 | |
parent | 9e49351c3060e1fa6e0d2de64505b7becf157f28 (diff) | |
parent | 6e210175c786247722bafca4103508421fa7dd30 (diff) |
Merge branch 'sl/sparse-write-tree-part-2'
Fix-up to a topic already graduated to 'master'.
* sl/sparse-write-tree-part-2:
t1092: update a write-tree test
-rwxr-xr-x | t/t1092-sparse-checkout-compatibility.sh | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index e58bfbfcb4..a63d0cc222 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -2089,22 +2089,32 @@ test_expect_success 'grep sparse directory within submodules' ' test_cmp actual expect ' -test_expect_success 'write-tree on all' ' +test_expect_success 'write-tree' ' init_repos && + test_all_match git write-tree && + write_script edit-contents <<-\EOF && echo text >>"$1" EOF + # make a change inside the sparse cone run_on_all ../edit-contents deep/a && - run_on_all git update-index deep/a && + test_all_match git update-index deep/a && test_all_match git write-tree && + test_all_match git status --porcelain=v2 && + # make a change outside the sparse cone run_on_all mkdir -p folder1 && run_on_all cp a folder1/a && run_on_all ../edit-contents folder1/a && - run_on_all git update-index folder1/a && - test_all_match git write-tree + test_all_match git update-index folder1/a && + test_all_match git write-tree && + test_all_match git status --porcelain=v2 && + + # check that SKIP_WORKTREE files are not materialized + test_path_is_missing sparse-checkout/folder2/a && + test_path_is_missing sparse-index/folder2/a ' test_expect_success 'sparse-index is not expanded: write-tree' ' |