Git development
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: Philippe Blain <levraiphilippeblain@gmail.com>
Cc: Guillaume CHAUVEL <guillaume.chauvel@gmail.com>, git@vger.kernel.org
Subject: Re: [BUG] submodule merge tries to read B's commit from A
Date: Fri, 2 Oct 2026 10:10:44 +0200	[thread overview]
Message-ID: <ar9nBA2e_sEiFZ4k@pks.im> (raw)
In-Reply-To: <ar5ppRMQ8NkGnbGp@pks.im>

On Thu, Oct 01, 2026 at 04:09:41PM +0200, Patrick Steinhardt wrote:
> On Wed, Sep 30, 2026 at 02:31:44PM -0400, Philippe Blain wrote:
> > I did not yet dig further, but I have a few additional observations:
> > 
> > - in contrast to the commit-graph bug, disabling the use of commit-graphs via
> >   'git config --global core.commitGraph false' early in the script, by moving the 'tmpdir'
> >   definition to the top and setting GIT_CONFIG_GLOBAL=$tmpdir/.gitconfig, does not change
> >   the behaviour, neither in the "repository corrupt" case, nor in the "hash mismatch" case.
> > - On Ubuntu 22.02 under WSL, the reproducer does not trigger the bug on v2.56.0-rc2 (on a dozen runs),
> >   but it does trigger it on v2.55.0. Funnily on that system with v2.56.0-rc2 I get the correct behaviour !
> >   (no "hash mismatch" either).
> > - On a Ubuntu 22.04 Docker container, I get the same behaviour as on RHEL 9.
> > 
> > > An AI analysis identified a likely cause: a delta-base cache entry may
> > > remain after its pack is closed. If a pack from another submodule reuses
> > > the same packed_git address and base offset, Git may return stale cached
> > > data.
> 
> Yup, that seems to be the issue indeed. We should really be clearing
> packfiles out of the delta base cache when closing packfiles, but we
> don't right now. I'll investigate tomorrow.

I've sent [1] now to fix this issue. Thanks!

Patrick

[1]: <20261002-pks-packfile-stale-delta-base-cache-v1-0-7592a3e31ae0@pks.im>

      reply	other threads:[~2026-10-02  8:10 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-23 20:20 [BUG] submodule merge tries to read B's commit from A Guillaume CHAUVEL
2026-09-30 18:31 ` Philippe Blain
2026-10-01 14:09   ` Patrick Steinhardt
2026-10-02  8:10     ` Patrick Steinhardt [this message]

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=ar9nBA2e_sEiFZ4k@pks.im \
    --to=ps@pks.im \
    --cc=git@vger.kernel.org \
    --cc=guillaume.chauvel@gmail.com \
    --cc=levraiphilippeblain@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