Skip to content

Commit 845d15d

Browse files
derrickstoleegitster
authored andcommitted
index-format: use 'cache tree' over 'cached tree'
The index has a "cache tree" extension. This corresponds to a significant API implemented in cache-tree.[ch]. However, there are a few places that refer to this erroneously as "cached tree". These are rare, but notably the index-format.txt file itself makes this error. The only other reference is in t7104-reset-hard.sh. Reported-by: Junio C Hamano <[email protected]> Signed-off-by: Derrick Stolee <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0e5c950 commit 845d15d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Documentation/technical/index-format.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Git index format
2626
Extensions are identified by signature. Optional extensions can
2727
be ignored if Git does not understand them.
2828

29-
Git currently supports cached tree and resolve undo extensions.
29+
Git currently supports cache tree and resolve undo extensions.
3030

3131
4-byte extension signature. If the first byte is 'A'..'Z' the
3232
extension is optional and can be ignored.
@@ -136,9 +136,9 @@ Git index format
136136

137137
== Extensions
138138

139-
=== Cached tree
139+
=== Cache tree
140140

141-
Cached tree extension contains pre-computed hashes for trees that can
141+
Cache tree extension contains pre-computed hashes for trees that can
142142
be derived from the index. It helps speed up tree object generation
143143
from index for a new commit.
144144

t/t7104-reset-hard.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ test_expect_success 'reset --hard should restore unmerged ones' '
3333
3434
'
3535

36-
test_expect_success 'reset --hard did not corrupt index or cached-tree' '
36+
test_expect_success 'reset --hard did not corrupt index or cache-tree' '
3737
3838
T=$(git write-tree) &&
3939
rm -f .git/index &&

0 commit comments

Comments
 (0)