From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Elijah Newren" <newren@gmail.com>,
"Patrick Steinhardt" <ps@pks.im>,
"SZEDER Gábor" <szeder.dev@gmail.com>
Subject: [PATCH 0/3] midx: honor custom bases for incremental writes
Date: Fri, 12 Jun 2026 16:07:05 -0400 [thread overview]
Message-ID: <cover.1781294771.git.me@ttaylorr.com> (raw)
SZEDER noticed[1] that t5334 was trying to call `nth_line()`, despite
that helper living only in t5335.
Fixing that should have made the test exercise `git multi-pack-index
write --incremental --base=...`. Instead, it uncovered another wrinkle,
which is that the normal MIDX write path parsed "--bases" without
actually passing it down to the MIDX writer.
This short series fixes both issues. It is structured as follows:
* The first patch moves `nth_line()` to lib-midx.sh so that t5334 and
t5335 use the same helper.
* The second patch threads the parsed `--base` value through
`write_midx_file()`, and consequently marks two t5334 cases as known
breakages.
* The final patch fixes the pack inclusion check and marks the tests
successful again.
The result is that `--base=none` and `--base=<hash>` now correctly
produce detached incremental layers that include any packs above the
selected base, preserving reachability closure for bitmaps.
Thanks in advance for your review!
[1]: https://lore.kernel.org/git/aiuaf3fKJ6kIITrf@szeder.dev/
Taylor Blau (3):
t5334: expose shared `nth_line()` helper
midx: pass custom '--base' through incremental writes
midx-write: include packs above custom incremental base
builtin/multi-pack-index.c | 3 ++-
builtin/repack.c | 2 +-
midx-write.c | 18 +++++++++++++-----
midx.h | 2 +-
t/lib-midx.sh | 6 ++++++
t/t5334-incremental-multi-pack-index.sh | 20 +++++++++++++++++---
t/t5335-compact-multi-pack-index.sh | 7 +------
7 files changed, 41 insertions(+), 17 deletions(-)
base-commit: 3e65291872de10c3f0bf05ea8c24187e7a71ebf0
--
2.55.0.rc0.3.g7bf7c87b605
next reply other threads:[~2026-06-12 20:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-12 20:07 Taylor Blau [this message]
2026-06-12 20:07 ` [PATCH 1/3] t5334: expose shared `nth_line()` helper Taylor Blau
2026-06-12 20:07 ` [PATCH 2/3] midx: pass custom '--base' through incremental writes Taylor Blau
2026-06-12 20:07 ` [PATCH 3/3] midx-write: include packs above custom incremental base Taylor Blau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1781294771.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=ps@pks.im \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox