* submodule: linked-worktree submodule hits BUG() in validate_submodule_legacy_git_dir()
@ 2026-11-16 22:51 Andreas Wendleder
2026-11-17 17:45 ` Adrian Ratiu
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Wendleder @ 2026-11-16 22:51 UTC (permalink / raw)
To: git; +Cc: Adrian Ratiu, Phillip Wood
With submodule.recurse=true, switching branches in a superproject worktree
whose submodule is itself a linked worktree of the submodule repository
aborts:
BUG: submodule.c:2414: submodule name 'sub' not a suffix of git dir
'.../.git/modules/sub/worktrees/sub1'
Reproduction (git 2.56.0; the code is the same on master, next and seen):
#!/bin/sh
set -e
export GIT_CONFIG_GLOBAL=/dev/null GIT_CONFIG_NOSYSTEM=1
g() { git -c user.name=t -c user.email=t@t -c protocol.file.allow=always "$@"; }
rm -rf w && mkdir w && cd w
g init -q -b main sub && g -C sub commit -q --allow-empty -m s1
g init -q -b main super && cd super
g submodule add -q ../sub sub && g commit -q -m add
g -C sub commit -q --allow-empty -m s2 && g add sub && g commit -q -m bump
g branch other HEAD~1
g worktree add -q --detach ../wt main
g -C sub worktree add -q --detach ../../other/sub HEAD # takes the name 'sub'
g -C sub worktree add -q --detach ../../wt/sub HEAD # so this one is 'sub1'
cd ../wt
g -c submodule.recurse=true switch other
submodule_move_head() expects validate_submodule_git_dir() to return < 0
and then dies with "refusing to create/use ... Enabling
extensions.submodulePathConfig should fix this", but without the extension
validate_submodule_legacy_git_dir() calls BUG() instead. A linked
worktree's git dir (modules/<name>/worktrees/<id>) never ends in the
submodule name, so this setup always hits it.
With extensions.submodulePathConfig enabled (repositoryformatversion 1),
the same commands no longer crash but die with the "refusing to create/use
..." message, which recommends enabling the extension that is already
enabled.
I would expect a linked worktree of a submodule's repository to be
accepted as the submodule's git dir. If it is meant to be rejected, the
legacy path should return an error instead of calling BUG(), and the hint
should not suggest the extension when it is already on.
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: submodule: linked-worktree submodule hits BUG() in validate_submodule_legacy_git_dir()
2026-11-16 22:51 submodule: linked-worktree submodule hits BUG() in validate_submodule_legacy_git_dir() Andreas Wendleder
@ 2026-11-17 17:45 ` Adrian Ratiu
0 siblings, 0 replies; 2+ messages in thread
From: Adrian Ratiu @ 2026-11-17 17:45 UTC (permalink / raw)
To: Andreas Wendleder, git; +Cc: Phillip Wood
Hi Andreas,
On Mon, 16 Nov 2026, Andreas Wendleder <gonsolo@gmail.com> wrote:
> With submodule.recurse=true, switching branches in a superproject worktree
> whose submodule is itself a linked worktree of the submodule repository
> aborts:
>
> BUG: submodule.c:2414: submodule name 'sub' not a suffix of git dir
> '.../.git/modules/sub/worktrees/sub1'
Thanks for reporting this and for the reproducer.
The BUG() is older than submodulePathConfig. Users could not reach it
before 9cf8547320 (clone: prevent clashing git dirs when cloning
submodule in parallel, 2024-01-28), which made submodule_move_head()
validate whatever path the submodule's gitfile points to. A path read
from disk can be anything, so it should never hit a BUG().
Your reproducer needs the second worktree because the gitdir ".../sub"
happens to end in the submodule name, so the check passes by accident.
t2405 sets up exactly this layout but never runs a recursvie checkout.
I'll send a fix.
> With extensions.submodulePathConfig enabled (repositoryformatversion 1),
> the same commands no longer crash but die with the "refusing to create/use
> ..." message, which recommends enabling the extension that is already
> enabled.
>
> I would expect a linked worktree of a submodule's repository to be
> accepted as the submodule's git dir. If it is meant to be rejected, the
> legacy path should return an error instead of calling BUG(), and the hint
> should not suggest the extension when it is already on.
Yes, the hint is actually my mistake.
I have a local fix which I need to test a bit more, but makes your
script switch cleanly in both modes and the main submodule checkout
isn't touched.
Will send it in the next few days with you in Reported-by.
Thanks again,
Adrian
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-17 17:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-16 22:51 submodule: linked-worktree submodule hits BUG() in validate_submodule_legacy_git_dir() Andreas Wendleder
2026-11-17 17:45 ` Adrian Ratiu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox