diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-11 13:49:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-11 13:49:12 -0700 |
| commit | 30e04bcfa8ceb032e42aeb8f0438ee4ec8303ca0 (patch) | |
| tree | 36cc1377fbcb496520c0938a5c3062cb6e1f4180 | |
| parent | 647a2bb3ffc02ed06a36d6bae35e76004e9f97d7 (diff) | |
| parent | 1ec40a83a54c9957636b1bf708ab3d8e261b751b (diff) | |
| download | git-30e04bcfa8ceb032e42aeb8f0438ee4ec8303ca0.tar.gz | |
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
| -rwxr-xr-x | t/t2107-update-index-basic.sh | 2 | ||||
| -rwxr-xr-x | t/t3060-ls-files-with-tree.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh index 07e6de84e6..89b285fa3a 100755 --- a/t/t2107-update-index-basic.sh +++ b/t/t2107-update-index-basic.sh @@ -83,7 +83,7 @@ test_expect_success '.lock files cleaned up' ' cd repo && git config core.worktree ../../worktree && # --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 && test_must_be_empty out && ! test -f .git/index.lock diff --git a/t/t3060-ls-files-with-tree.sh b/t/t3060-ls-files-with-tree.sh index c4a72ae446..5a06732ca7 100755 --- a/t/t3060-ls-files-with-tree.sh +++ b/t/t3060-ls-files-with-tree.sh @@ -40,7 +40,7 @@ test_expect_success 'setup' ' git commit -a -m "remove them all" && # 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 && >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' ' - # 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 ( cd sub && |