mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sl/sparse-write-tree-part-2'

Browse Source 
Fix-up to a topic already graduated to 'master'.

* sl/sparse-write-tree-part-2:
  t1092: update a write-tree test
This commit is contained in:
Junio C Hamano 2023-05-25 05:53:55 +09:00
commit 6a6621fe9a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2089,22 +2089,32 @@ test_expect_success 'grep sparse directory within submodules' '
test_cmp actual expect test_cmp actual expect
' '
test_expect_success 'write-tree on all' ' test_expect_success 'write-tree' '
init_repos && init_repos &&
test_all_match git write-tree &&
write_script edit-contents <<-\EOF && write_script edit-contents <<-\EOF &&
echo text >>"$1" echo text >>"$1"
EOF EOF
# make a change inside the sparse cone
run_on_all ../edit-contents deep/a && 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 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 mkdir -p folder1 &&
run_on_all cp a folder1/a && run_on_all cp a folder1/a &&
run_on_all ../edit-contents folder1/a && run_on_all ../edit-contents folder1/a &&
run_on_all git update-index folder1/a && test_all_match git update-index folder1/a &&
test_all_match git write-tree 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' ' test_expect_success 'sparse-index is not expanded: write-tree' '