]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/incremental-midx-part-3.2' into seen
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Jan 2026 18:37:32 +0000 (10:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Jan 2026 18:37:32 +0000 (10:37 -0800)
Further work on incremental repacking using MIDX/bitmap

Comments?

* tb/incremental-midx-part-3.2:
  midx: enable reachability bitmaps during MIDX compaction
  midx: implement MIDX compaction
  t/helper/test-read-midx.c: plug memory leak when selecting layer
  midx-write.c: factor fanout layering from `compute_sorted_entries()`
  midx-write.c: enumerate `pack_int_id` values directly
  midx-write.c: extract `fill_pack_from_midx()`
  midx-write.c: introduce `midx_pack_perm()` helper
  git-compat-util.h: introduce `u32_add()`
  midx: do not require packs to be sorted in lexicographic order
  midx-write.c: introduce `struct write_midx_opts`
  midx-write.c: don't use `pack_perm` when assigning `bitmap_pos`
  t/t5319-multi-pack-index.sh: fix copy-and-paste error in t5319.39
  git-multi-pack-index(1): align SYNOPSIS with 'git multi-pack-index -h'
  git-multi-pack-index(1): remove non-existent incompatibility
  builtin/multi-pack-index.c: make '--progress' a common option
  midx: introduce `midx_get_checksum_hex()`
  midx: rename `get_midx_checksum()` to `midx_get_checksum_hash()`
  midx: mark `get_midx_checksum()` arguments as const

1  2 
git-compat-util.h
midx.c
pack-bitmap.c
t/meson.build

Simple merge
diff --cc midx.c
Simple merge
diff --cc pack-bitmap.c
Simple merge
diff --cc t/meson.build
Simple merge