undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ar/adjust-tests-for-the-index-fallout'

Browse Source 
Comment updates.

* ar/adjust-tests-for-the-index-fallout:
  t2107: fix mention of the_index.cache_changed
  t3060: fix mention of function prune_index
This commit is contained in:
Junio C Hamano 2023-04-11 13:49:12 -07:00
commit 30e04bcfa8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t2107-update-index-basic.sh
View File

@ -83,7 +83,7 @@ test_expect_success '.lock files cleaned up' '
cd repo && cd repo &&
git config core.worktree ../../worktree && git config core.worktree ../../worktree &&
# --refresh triggers late setup_work_tree, # --refresh triggers late setup_work_tree,
# active_cache_changed is zero, rollback_lock_file fails # the_index.cache_changed is zero, rollback_lock_file fails
git update-index --refresh --verbose >out && git update-index --refresh --verbose >out &&
test_must_be_empty out && test_must_be_empty out &&
! test -f .git/index.lock ! test -f .git/index.lock

4
t/t3060-ls-files-with-tree.sh
View File

@ -40,7 +40,7 @@ test_expect_success 'setup' '
git commit -a -m "remove them all" && git commit -a -m "remove them all" &&
# The bug also requires some entry before our directory so that # The bug also requires some entry before our directory so that
# prune_path will modify the_index.cache # prune_index will modify the_repository->index.cache
mkdir a_directory_that_sorts_before_sub && mkdir a_directory_that_sorts_before_sub &&
>a_directory_that_sorts_before_sub/file && >a_directory_that_sorts_before_sub/file &&
@ -56,7 +56,7 @@ test_expect_success 'usage' '
' '
test_expect_success 'git ls-files --with-tree should succeed from subdir' ' test_expect_success 'git ls-files --with-tree should succeed from subdir' '
# We have to run from a sub-directory to trigger prune_path # We have to run from a sub-directory to trigger prune_index
# Then we finally get to run our --with-tree test # Then we finally get to run our --with-tree test
( (
cd sub && cd sub &&