git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] MIDX: revert the default version to v1

From
Jeff King <peff@peff.net>
Date
Apr 16, 2026, 20:06 UTC
Message-ID
<20260416200659.GB1887222@coredump.intra.peff.net>
In-Reply-To
<xmqq8qam217m.fsf_-_@gitster.g>
On Thu, Apr 16, 2026 at 11:45:49AM -0700, Junio C Hamano wrote:
Show 14 quoted lines
> From: Jeff King <peff@peff.net>
> 
> Dscho reports that fetching into a repository with Git 2.54-rc2 made
> it unusable with Git 2.53, as the recent code by default writes
> version 2 multi-pack-index files.  Version 2 is the base of more
> advanced features to come, but using it where these features are not
> used is a strict regression.
> 
> As deployed versions of Git and its reimplementations may not be
> ready for the format bump, let's revert the default version of MIDX
> file we write back to V1, and adjust tests that exercise V2-specific
> features to explicitly request V2.
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>

This looks fine to me, and you can add my S-o-b if you want. But let me propose a slight alternative that reduces the test churn and may make things easier going forward.

-- >8 --
Subject: [PATCH] MIDX: revert the default version to v1

We introduced midx version 2 in b2ec8e90c2 (midx: do not require packs to be sorted in lexicographic order, 2026-02-24) and now write it by default. The rationale was that older versions should ignore the v2 midx and fall back to using the packs (just like we do for other midx errors). Unfortunately this is not the case, as we have a hard die() when we see an unknown midx version.

As a result, writing a midx with Git 2.54-rc2 puts the repository into a state that is unusable with Git 2.53. And this midx write may happen behind the scenes as part of normal operations, like fetch.

Let's switch back to writing v1 by default to avoid regressing the case where multiple versions of Git are used on the same repository.

There is one gotcha, though: the v2 format is required for some new features, like midx compaction, and running "git multi-pack-index compact" will complain when asked to write a v1 index. The user must set midx.version to "2" to make the feature work.

So instead of always using v1, we'll base the default on whether the requested feature requires v2. That does mean that running midx compaction will create a repository that can't be read by older versions of Git. But we never do that by default; only people experimenting with the new feature will be affected.

We have to adjust the test expectation in t5319, since it will now generate v1 files. And our "auto-select v2" is covered by the tests in t5335, which continue to check that compaction works without having to set midx.version manually (and also explicitly check that asking for v1 with compaction reports the problem).

Signed-off-by: Jeff King <peff@peff.net>
---
I have a feeling there are probably some gaps in v2 testing in t5319,
since we are no longer using v2 for the bulk of the tests. IMHO that is
OK to sort out post-release.
 Documentation/git-multi-pack-index.adoc | 3 +++
 midx-write.c                            | 4 +++-
 t/t5319-multi-pack-index.sh             | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-multi-pack-index.adoc b/Documentation/git-multi-pack-index.adoc
index 6125683014..3a5aa22778 100644
--- a/Documentation/git-multi-pack-index.adoc
+++ b/Documentation/git-multi-pack-index.adoc
@@ -98,6 +98,9 @@ compact::
 	--[no-]bitmap::
 		Control whether or not a multi-pack bitmap is written.
 --
++
+Note that the compact command requires writing a version-2 midx that
+cannot be read by versions of Git prior to v2.54.
 
 verify::
 	Verify the contents of the MIDX file.
diff --git a/midx-write.c b/midx-write.c
index 0ff2e45aa7..a89ac53045 100644
--- a/midx-write.c
+++ b/midx-write.c
@@ -1259,7 +1259,6 @@ static int write_midx_internal(struct write_midx_opts *opts)
 	struct tempfile *incr;
 	struct write_midx_context ctx = {
 		.preferred_pack_idx = NO_PREFERRED_PACK,
-		.version = MIDX_VERSION_V2,
 	 };
 	struct multi_pack_index *midx_to_free = NULL;
 	int bitmapped_packs_concat_len = 0;
@@ -1275,6 +1274,9 @@ static int write_midx_internal(struct write_midx_opts *opts)
 	ctx.repo = r;
 	ctx.source = opts->source;
 
+	ctx.version = opts->flags & MIDX_WRITE_COMPACT ?
+		MIDX_VERSION_V2 :
+		MIDX_VERSION_V1;
 	repo_config_get_int(ctx.repo, "midx.version", &ctx.version);
 	if (ctx.version != MIDX_VERSION_V1 && ctx.version != MIDX_VERSION_V2)
 		die(_("unknown MIDX version: %d"), ctx.version);
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 58e0b685b1..fa0d4046f7 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -21,7 +21,7 @@ midx_read_expect () {
 	EXTRA_CHUNKS="$5"
 	{
 		cat <<-EOF &&
-		header: 4d494458 2 $HASH_LEN $NUM_CHUNKS $NUM_PACKS
+		header: 4d494458 1 $HASH_LEN $NUM_CHUNKS $NUM_PACKS
 		chunks: pack-names oid-fanout oid-lookup object-offsets$EXTRA_CHUNKS
 		num_objects: $NUM_OBJECTS
 		packs:
-- 
2.54.0.rc2.265.g593c85fc46
Previous: Taylor BlauNext: Junio C Hamano
Message 23 of 30 in “[ANNOUNCE] Git v2.54.0-rc2”
  1. Junio C HamanoApr 14, 2026
  2. MIDX woes, was Re: [ANNOUNCE] Git v2.54.0-rc2Johannes Schindelin, Apr 15, 2026
  3. Junio C HamanoApr 15, 2026
  4. Jeff KingApr 16, 2026
  5. Jeff KingApr 16, 2026
  6. Derrick StoleeApr 16, 2026
  7. Junio C HamanoApr 16, 2026
  8. Taylor BlauApr 16, 2026
  9. Derrick StoleeApr 19, 2026
  10. Junio C HamanoApr 20, 2026
  11. Taylor BlauApr 16, 2026
  12. Jeff KingApr 16, 2026
  13. Junio C HamanoApr 16, 2026
  14. Junio C HamanoApr 16, 2026
  15. Jeff KingApr 16, 2026
  16. Junio C HamanoApr 16, 2026
  17. Jeff KingApr 16, 2026
  18. Junio C HamanoApr 17, 2026
  19. MIDX: revert the default version to v1Junio C Hamano, Apr 16, 2026
  20. Junio C HamanoApr 16, 2026
  21. Junio C HamanoApr 16, 2026
  22. Taylor BlauApr 16, 2026
  23. Jeff KingApr 16, 2026
  24. Junio C HamanoApr 16, 2026
  25. Jeff KingApr 16, 2026
  26. Jeff KingApr 16, 2026
  27. Taylor BlauApr 16, 2026
  28. Jeff KingApr 16, 2026
  29. Junio C HamanoApr 17, 2026
  30. Elijah NewrenApr 17, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.