Skip to content

Commit 30e04bc

Browse files
committed
Merge branch 'ar/adjust-tests-for-the-index-fallout'
Comment updates. * ar/adjust-tests-for-the-index-fallout: t2107: fix mention of the_index.cache_changed t3060: fix mention of function prune_index
2 parents 647a2bb + 1ec40a8 commit 30e04bc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

t/t2107-update-index-basic.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ test_expect_success '.lock files cleaned up' '
8383
cd repo &&
8484
git config core.worktree ../../worktree &&
8585
# --refresh triggers late setup_work_tree,
86-
# active_cache_changed is zero, rollback_lock_file fails
86+
# the_index.cache_changed is zero, rollback_lock_file fails
8787
git update-index --refresh --verbose >out &&
8888
test_must_be_empty out &&
8989
! test -f .git/index.lock

t/t3060-ls-files-with-tree.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ test_expect_success 'setup' '
4040
git commit -a -m "remove them all" &&
4141
4242
# The bug also requires some entry before our directory so that
43-
# prune_path will modify the_index.cache
43+
# prune_index will modify the_repository->index.cache
4444
4545
mkdir a_directory_that_sorts_before_sub &&
4646
>a_directory_that_sorts_before_sub/file &&
@@ -56,7 +56,7 @@ test_expect_success 'usage' '
5656
'
5757

5858
test_expect_success 'git ls-files --with-tree should succeed from subdir' '
59-
# We have to run from a sub-directory to trigger prune_path
59+
# We have to run from a sub-directory to trigger prune_index
6060
# Then we finally get to run our --with-tree test
6161
(
6262
cd sub &&

0 commit comments

Comments
 (0)