diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-30 23:20:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-30 23:20:30 +0300 |
| commit | de6dda0dc3d95cd9aaf43a7b85ceeb57316dcc27 (patch) | |
| tree | 8c970a139cd81136e71e6db49807b55878b6d54e /t/t5318-commit-graph.sh | |
| parent | 47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc (diff) | |
| parent | 7fbfe07ab4d4e58c0971dac73001b89f180a0af3 (diff) | |
Merge branch 'sg/commit-graph-cleanups' into master
The changed-path Bloom filter is improved using ideas from an
independent implementation.
* sg/commit-graph-cleanups:
commit-graph: simplify write_commit_graph_file() #2
commit-graph: simplify write_commit_graph_file() #1
commit-graph: simplify parse_commit_graph() #2
commit-graph: simplify parse_commit_graph() #1
commit-graph: clean up #includes
diff.h: drop diff_tree_oid() & friends' return value
commit-slab: add a function to deep free entries on the slab
commit-graph-format.txt: all multi-byte numbers are in network byte order
commit-graph: fix parsing the Chunk Lookup table
tree-walk.c: don't match submodule entries for 'submod/anything'
Diffstat (limited to 't/t5318-commit-graph.sh')
| -rwxr-xr-x | t/t5318-commit-graph.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index 26f332d6a3..50d5f0849f 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -529,7 +529,7 @@ test_expect_success 'detect bad hash version' ' ' test_expect_success 'detect low chunk count' ' - corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\02" \ + corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\01" \ "missing the .* chunk" ' @@ -615,7 +615,8 @@ test_expect_success 'detect invalid checksum hash' ' test_expect_success 'detect incorrect chunk count' ' corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\377" \ - "chunk lookup table entry missing" $GRAPH_CHUNK_LOOKUP_OFFSET + "commit-graph file is too small to hold [0-9]* chunks" \ + $GRAPH_CHUNK_LOOKUP_OFFSET ' test_expect_success 'git fsck (checks commit-graph)' ' |