Message ID | pull.703.v2.git.1597673089.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 2020-08-17 at 14:04:45, Derrick Stolee via GitGitGadget wrote: > As discussed [1], there is some concern around binary file formats requiring > the context of the repository config in order to infer hash lengths. Two > formats that were designed with the hash transition in mind (commit-graph > and multi-pack-index) have bytes available to indicate the hash algorithm > used. Let's actually update these formats to be more self-contained with the > two hash algorithms being available. > > [1] > https://lore.kernel.org/git/CAN0heSp024=Kyy7gdQ2VSetk_5iVhj_qdT8CMVPcry_AwWrhHQ@mail.gmail.com/ > > This merges cleanly with tb/bloom-improvements, but both that branch and > this patch series have merge conflicts with the corrected commit date patch > series [2]. > > [2] > https://lore.kernel.org/git/pull.676.v2.git.1596941624.gitgitgadget@gmail.com/ This series looked sane to me. Thanks for the patches, and feel free to have my Reviewed-by: brian m. carlson <sandals@crustytoothpaste.net>
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh index 211ec625d2..09f133792c 100755 --- a/t/t5324-split-commit-graph.sh +++ b/t/t5324-split-commit-graph.sh @@ -464,7 +464,7 @@ test_expect_success 'setup repo for mixed generation commit-graph-chain' ' GIT_TEST_COMMIT_GRAPH_NO_GDAT=1 git commit-graph write --reachable --split=no-merge && test-tool read-graph >output && cat >expect <<-EOF && - header: 43475048 1 1 4 1 + header: 43475048 1 $(test_oid oid_version) 4 1 num_commits: 2 chunks: oid_fanout oid_lookup commit_metadata EOF @@ -482,7 +482,7 @@ test_expect_success 'does not write generation data chunk if not present on exis git commit-graph write --reachable --split=no-merge && test-tool read-graph >output && cat >expect <<-EOF && - header: 43475048 1 1 4 2 + header: 43475048 1 $(test_oid oid_version) 4 2 num_commits: 3 chunks: oid_fanout oid_lookup commit_metadata EOF