From: Adrian Ratiu Date: Thu, 19 Nov 2026 12:19:16 GMT Subject: Re: [PATCH 3/3] submodule: accept a linked worktree as the submodule's git dir Message-ID: <87y0aphv3v.fsf@collabora.com> In-Reply-To: On Wed, 18 Nov 2026, Junio C Hamano wrote: >> @@ -2191,7 +2232,13 @@ int submodule_move_head(const char *path, const char *super_prefix, >> submodule_reset_index(path, super_prefix); >> } >> >> - if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) { >> + /* >> + * Do not reconnect a linked worktree to the submodule's >> + * main git dir: that would take over the git dir of another >> + * working tree. >> + */ >> + if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE) && >> + !is_worktree) { > > If a linked-worktree submodule 'sub' contains a nested submodule > 'inner' whose .git is a directory, submodule_uses_gitfile("sub") > would have returned 0 (because the check is recursive), we ran > absorb_git_dir_into_superproject() (which is also recursive so it > would cause .git in 'inner' to be absorbed), and is_worktree is > still 0 at this point, which means if() condition here is satisfied > (if forced) and we will enter this block. Would it cause an issue? Yes, good catch. I reproduced it with a "sub" linked worktree and a "sub/inner/.git" directory, a recursive checkout absorbs the "inner" and then rewrites sub/.git to point to "$GIT_DIR/modules/sub" which does not exist: fatal: gitfile does not point to a valid repository: .git error: Submodule 'sub' could not be updated. It's basically the same breakage this patch is meant to fix, just reached through the absorb path. > > I am wondering if the check for is_worktree should be moved outside > the else clause, i.e. making the overall flow look more like > > if (old_head) { > if (!submodule_uses_gitfile(path)) > absorb_git_dir_into_superproject(path, super_prefix); > > /* > * Now path/.git is guaranteed to be a gitfile; > * validate and detect worktrees. > */ > ... > is_worktree = validate_submodule_gitfile_dir(git_dir, sub->name); > ... > } Yes, that fixes it, the sub/.git is left alone and the submodule is checked-out at the correct commit. The validation also runs after an absorb, but absorb puts the gitdir where submodule_name_to_gitdir() says it should be, so the check always passes. > Or am I grossly misreading the code flow? You understood it perfectly. :) I'll do this in v2 as well. Many thanks!