diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:40:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:40:44 -0800 |
| commit | a0a2d75d3b39632a8ed9c71320c3e9e77e40946a (patch) | |
| tree | 378048286b434d61efbcaed35af1b79ce14c252f /t | |
| parent | Merge branch 'en/ort-conflict-handling' (diff) | |
| parent | cache-tree: speed up consecutive path comparisons (diff) | |
| download | tgif-a0a2d75d3b39632a8ed9c71320c3e9e77e40946a.tar.xz | |
Merge branch 'ds/cache-tree-basics'
Document, clean-up and optimize the code around the cache-tree
extension in the index.
* ds/cache-tree-basics:
cache-tree: speed up consecutive path comparisons
cache-tree: use ce_namelen() instead of strlen()
index-format: discuss recursion of cache-tree better
index-format: update preamble to cache tree extension
index-format: use 'cache tree' over 'cached tree'
cache-tree: trace regions for prime_cache_tree
cache-tree: trace regions for I/O
cache-tree: use trace2 in cache_tree_update()
unpack-trees: add trace2 regions
tree-walk: report recursion counts
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7104-reset-hard.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 && |