Git development
 help / color / mirror / Atom feed
From: Taylor Blau <me@ttaylorr.com>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
	git@vger.kernel.org,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] MIDX: revert the default version to v1
Date: Thu, 16 Apr 2026 17:12:30 -0400	[thread overview]
Message-ID: <aeFQvu4iqJAQMjCy@nand.local> (raw)
In-Reply-To: <20260416200659.GB1887222@coredump.intra.peff.net>

On Thu, Apr 16, 2026 at 04:06:59PM -0400, Jeff King wrote:
> 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.

Same here, I agree with the discussion earlier in the thread about what
the right short- and medium-term solutions are, and I think that
including Junio's patch is a good approach.

If we take that, please also feel free to add my Acked-by, or
Reviewed-by, or similar.

> -- >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.

I'm not sure if it's worth mentioning, but I think that it's reasonable
to say "Git 2.53 and earlier", with the implied lower bound being which
version first introduced the MIDX. I think it's equally fine as-is,
though.

> 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).

I think that the test fallout that Junio's patch necessitates isn't all
that bad, and in some sense I think the "write version 1 usually, but
version 2 if the feature requires it" is a little magical. That being
said, anyone doing things that would require a v2 MIDX likely already
understand what the trade-offs are, so in that sense I think that this
is less magical and more "do the sensible thing by default".

I don't have strong feelings either way and would be fine with either. I
think if anything I have a vague preference towards the approach taken
here, but either would be fine with me.

> 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.

Perhaps, although you could make the opposite argument for v1 MIDXs
when we previously switched the default to write v2 MIDXs. The format
differs only in the version field, and the ordering constraints on the
packs within the MIDX. That area and the compatibility issues here are
the "interesting" parts to test IMHO.

>  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(-)

The patch itself looks as expected to me. Thanks for working on it, and
sorry again for the mess here.

Thanks,
Taylor

  parent reply	other threads:[~2026-04-16 21:12 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-14 15:22 [ANNOUNCE] Git v2.54.0-rc2 Junio C Hamano
2026-04-15 20:50 ` MIDX woes, was " Johannes Schindelin
2026-04-15 21:04   ` Junio C Hamano
2026-04-16  5:17     ` Jeff King
2026-04-16  5:34       ` Jeff King
2026-04-16 13:24         ` Derrick Stolee
2026-04-16 16:09           ` Junio C Hamano
2026-04-16 20:29             ` Taylor Blau
2026-04-19 22:41               ` Derrick Stolee
2026-04-20  1:52                 ` Junio C Hamano
2026-04-16 20:26           ` Taylor Blau
2026-04-16 23:29             ` Jeff King
2026-04-16 18:10         ` Junio C Hamano
2026-04-16 18:18           ` Junio C Hamano
2026-04-16 19:49             ` Jeff King
2026-04-16 20:12               ` Junio C Hamano
2026-04-16 23:23                 ` Jeff King
2026-04-17  4:15                   ` Junio C Hamano
2026-04-16 18:45           ` [PATCH] MIDX: revert the default version to v1 Junio C Hamano
2026-04-16 19:38             ` Junio C Hamano
2026-04-16 20:58               ` Junio C Hamano
2026-04-16 21:13                 ` Taylor Blau
2026-04-16 20:06             ` Jeff King
2026-04-16 20:55               ` Junio C Hamano
2026-04-16 23:24                 ` Jeff King
2026-04-16 23:26                   ` Jeff King
2026-04-16 21:12               ` Taylor Blau [this message]
2026-04-16 23:27                 ` Jeff King
2026-04-17 15:19 ` [ANNOUNCE] Git v2.54.0-rc2 Junio C Hamano
2026-04-17 17:03   ` Elijah Newren

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=aeFQvu4iqJAQMjCy@nand.local \
    --to=me@ttaylorr.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /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