From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Patrick Steinhardt <ps@pks.im>,
git@vger.kernel.org, Tian Yuchen <cat@malon.dev>
Subject: Re: [PATCH v3] read_gitfile(): simplify NOT_A_REPO error message
Date: Tue, 16 Jun 2026 10:45:54 -0400 [thread overview]
Message-ID: <20260616144554.GA2305974@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqq7bnya7gh.fsf@gitster.g>
On Tue, Jun 16, 2026 at 07:25:02AM -0700, Junio C Hamano wrote:
> > +@@ t/t7450-bad-git-dotfiles.sh: test_expect_success 'git dirs of sibling submodules must not be nested' '
> > + test_expect_success 'submodule git dir nesting detection must work with parallel cloning' '
> > + test_must_fail git clone --recurse-submodules --jobs=2 nested clone_parallel 2>err &&
> > + cat err &&
> > +- grep -E "(already exists|is inside git dir|not a git repository)" err &&
> > ++ grep -E "(already exists|is inside git dir|does not point to a valid repository)" err &&
>
> A few things.
>
> * Will we be happy to see only one of these possibilities, or do we
> expect to see these once for each kind?
I imagine it is only one. This all comes from 9cf8547320 (clone: prevent
clashing git dirs when cloning submodule in parallel, 2024-01-28), and
it is expecting the nested path to cause a failure. Which failure I
guess depends on the racy ordering. If we create the inner one first,
then we probably get "already exists", and if the outer one, then "is
inside git dir". I don't know exactly what sequence yields the
NOT_A_REPO message.
But none of that is changing in this patch, just what the user-visible
text is for the NOT_A_REPO case.
I did briefly wonder if we might see "not a git repository" from a
_different_ code path, and need to catch it along with the new message.
But running successfully with --stress implies that we never see the old
one anymore.
> * a recently started in-flight topic tries to catch bare "grep" and
> fails until you write test_grep X-<.
Yeah. This will create a merge conflict for you, but hopefully the
resolution should be obvious. I don't think it makes sense to fix here,
as it's orthogonal to the purpose of the patch.
-Peff
next prev parent reply other threads:[~2026-06-16 14:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-02 6:11 [PATCH] read_gitfile_gently(): return non-repo path on error Jeff King
2026-06-02 7:42 ` Junio C Hamano
2026-06-02 8:02 ` Jeff King
2026-06-02 8:36 ` Patrick Steinhardt
2026-06-04 6:27 ` Jeff King
2026-06-04 7:08 ` Patrick Steinhardt
2026-06-10 13:01 ` Junio C Hamano
2026-06-16 11:19 ` [PATCH v2] read_gitfile(): simplify NOT_A_REPO error message Jeff King
2026-06-16 12:35 ` [PATCH v3] " Jeff King
2026-06-16 14:25 ` Junio C Hamano
2026-06-16 14:45 ` Jeff King [this message]
2026-06-16 15:48 ` Junio C Hamano
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=20260616144554.GA2305974@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=cat@malon.dev \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ps@pks.im \
/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