From: Jeff King <peff@peff•net>
To: Junio C Hamano <gitster@pobox•com>
Cc: Adrian Ratiu <adrian.ratiu@collabora•com>, git@vger•kernel.org
Subject: Re: What's cooking in git.git (Nov 2025, #10; Sun, 30)
Date: Mon, 1 Dec 2025 06:43:36 -0500 [thread overview]
Message-ID: <20251201114336.GA1559453@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqq5xaqbxmk.fsf@gitster.g>
On Sun, Nov 30, 2025 at 09:05:07PM -0800, Junio C Hamano wrote:
> * ar/submodule-gitdir-tweak (2025-11-19) 7 commits
> - meson/Makefile: allow setting submodule encoding at build time
> - submodule: use hashed name for gitdir
> - submodule: fix case-folding gitdir filesystem colisions
> - submodule: add extension to encode gitdir paths
> - submodule: always validate gitdirs inside submodule_name_to_gitdir
> - builtin/credential-store: move is_rfc3986_unreserved to url.[ch]
> - submodule--helper: use submodule_name_to_gitdir in add_submodule
>
> Avoid local submodule repository directory paths overlapping with
> each other by encoding submodule names before using them as path
> components.
>
> Will merge to 'next'?
> source: <20251119211030.2008441-1-adrian.ratiu@collabora•com>
This topic seems to introduce a race in t7450. Running:
make && (cd t && ./t7450-bad-git-dotfiles.sh --stress-limit=50)
usually fails within 10 or so iterations, whereas without this topic I
can reliably get through 50 iterations (since it's racy, nothing is for
sure, but it seems to trigger pretty easily).
The failing test is the parallel one added by 9cf8547320 (clone: prevent
clashing git dirs when cloning submodule in parallel, 2024-01-28), which
is making sure we catch nested modules during a parallel checkout. The
race seems to be in Git itself, and not an artifact of the test (so this
isn't a race we want to wave away, but probably a real bug, perhaps even
one with security implications, according to that commit).
Bisection points to 099fe37397 (submodule: always validate gitdirs
inside submodule_name_to_gitdir, 2025-11-19). Which seems plausible,
given that it tries to move those same checks from 9cf8547320 around.
It's also possible that the race was always there and this simply makes
it worse, but I wasn't ever able to trigger it on a pre-099fe37397
commit.
-Peff
next prev parent reply other threads:[~2025-12-01 11:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-01 5:05 What's cooking in git.git (Nov 2025, #10; Sun, 30) Junio C Hamano
2025-12-01 9:54 ` Patrick Steinhardt
2025-12-01 10:53 ` Karthik Nayak
2025-12-07 0:43 ` Junio C Hamano
2025-12-01 11:43 ` Jeff King [this message]
2025-12-08 8:44 ` Adrian Ratiu
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=20251201114336.GA1559453@coredump.intra.peff.net \
--to=peff@peff$(echo .)net \
--cc=adrian.ratiu@collabora$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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