summaryrefslogtreecommitdiffstats
path: root/pseudo-merge.c
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2024-05-23 23:26:55 +0200
committerJunio C Hamano <gitster@pobox.com>2024-05-24 20:40:43 +0200
commit7c0fae88442824cfb4a3160d61a00c54287d56a7 (patch)
tree4e5143cd424b81d2af184a61ef78c13ae530810d /pseudo-merge.c
parentpseudo-merge: scaffolding for reads (diff)
downloadgit-7c0fae88442824cfb4a3160d61a00c54287d56a7.tar.xz
git-7c0fae88442824cfb4a3160d61a00c54287d56a7.zip
pack-bitmap.c: read pseudo-merge extension
Now that the scaffolding for reading the pseudo-merge extension has been laid, teach the pack-bitmap machinery to read the pseudo-merge extension when present. Note that pseudo-merges themselves are not yet used during traversal, this step will be taken by a future commit. In the meantime, read the table and initialize the pseudo_merge_map structure introduced by a previous commit. When the pseudo-merge extension is present, `load_bitmap_header()` performs basic sanity checks to make sure that the table is well-formed. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pseudo-merge.c')
0 files changed, 0 insertions, 0 deletions