diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2021-01-07 16:32:07 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-15 23:04:38 -0800 |
| commit | 845d15d4d07bef903bf6f87275d2be11ca0647b5 (patch) | |
| tree | b30df366d40796f6ae5980d47299706739e6a30a | |
| parent | cache-tree: trace regions for prime_cache_tree (diff) | |
| download | git-845d15d4d07bef903bf6f87275d2be11ca0647b5.tar.gz git-845d15d4d07bef903bf6f87275d2be11ca0647b5.zip | |
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 <gitster@pobox.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/technical/index-format.txt | 6 | ||||
| -rwxr-xr-x | t/t7104-reset-hard.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt index 69edf46c03..c71314731e 100644 --- a/Documentation/technical/index-format.txt +++ b/Documentation/technical/index-format.txt @@ -26,7 +26,7 @@ Git index format Extensions are identified by signature. Optional extensions can be ignored if Git does not understand them. - Git currently supports cached tree and resolve undo extensions. + Git currently supports cache tree and resolve undo extensions. 4-byte extension signature. If the first byte is 'A'..'Z' the extension is optional and can be ignored. @@ -136,9 +136,9 @@ Git index format == Extensions -=== Cached tree +=== Cache tree - Cached tree extension contains pre-computed hashes for trees that can + Cache tree extension contains pre-computed hashes for trees that can be derived from the index. It helps speed up tree object generation from index for a new commit. diff --git a/t/t7104-reset-hard.sh b/t/t7104-reset-hard.sh index 16faa07813..7948ec392b 100755 --- a/t/t7104-reset-hard.sh +++ b/t/t7104-reset-hard.sh @@ -33,7 +33,7 @@ test_expect_success 'reset --hard should restore unmerged ones' ' ' -test_expect_success 'reset --hard did not corrupt index or cached-tree' ' +test_expect_success 'reset --hard did not corrupt index or cache-tree' ' T=$(git write-tree) && rm -f .git/index && |