From: Junio C Hamano <gitster@pobox.com>
To: Adrian Ratiu <adrian.ratiu@collabora.com>
Cc: git@vger.kernel.org, Andreas Wendleder <gonsolo@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Patrick Steinhardt <ps@pks.im>
Subject: Re: [PATCH 3/3] submodule: accept a linked worktree as the submodule's git dir
Date: Wed, 18 Nov 2026 11:52:07 -0800 [thread overview]
Message-ID: <xmqqv75t534o.fsf@gitster.g> (raw)
In-Reply-To: <20261118163249.1693361-4-adrian.ratiu@collabora.com> (Adrian Ratiu's message of "Wed, 18 Nov 2026 18:32:49 +0200")
Adrian Ratiu <adrian.ratiu@collabora.com> writes:
> A submodule's working tree can be a linked worktree of the submodule's
> repository, created e.g. with:
>
> git -C super/sub worktree add ../../wt/sub
>
> Its .git file then points to "super/.git/modules/sub/worktrees/<id>"
> instead of "super/.git/modules/sub". t2405 already creates such a
> submodule, but it doesn't test a recursive checkout, and its worktree
> id happens to match the submodule name.
It is tempting to say "don't do it then", but if we can cater to the
use case that is great ;-)
> @@ -2132,6 +2171,7 @@ int submodule_move_head(const char *path, const char *super_prefix,
> struct child_process cp = CHILD_PROCESS_INIT;
> const struct submodule *sub;
> int *error_code_ptr, error_code;
> + int is_worktree = 0;
>
> if (!is_submodule_active(the_repository, path))
> return 0;
> @@ -2170,8 +2210,9 @@ int submodule_move_head(const char *path, const char *super_prefix,
> char *git_dir = xstrdup(read_gitfile(dotgit));
>
> free(dotgit);
> - if (validate_submodule_git_dir(git_dir,
> - sub->name) < 0) {
> + is_worktree = validate_submodule_gitfile_dir(git_dir,
> + sub->name);
> + if (is_worktree < 0) {
> if (!the_repository->repository_format_submodule_path_cfg)
> advise(_("enabling extensions.submodulePathConfig "
> "might fix the following error."));
Earlier near the beginning of the function we initialized
is_worktree to 0 and then only when submodule_uses_gitfile() is
true, we update it with validate_submodule_gitfile_dir().
> @@ -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?
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);
...
}
Or am I grossly misreading the code flow?
Thanks.
next prev parent reply other threads:[~2026-11-18 19:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
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
2026-11-18 16:32 ` [PATCH 0/3] submodule: support linked worktrees in recursive checkout Adrian Ratiu
2026-11-18 16:32 ` [PATCH 1/3] submodule: return an error instead of BUG() for an unexpected git dir Adrian Ratiu
2026-11-18 19:15 ` Junio C Hamano
2026-11-18 19:33 ` Adrian Ratiu
2026-11-18 16:32 ` [PATCH 2/3] submodule: only suggest submodulePathConfig when it is disabled Adrian Ratiu
2026-11-18 19:28 ` Junio C Hamano
2026-11-19 11:46 ` Adrian Ratiu
2026-11-19 22:14 ` Junio C Hamano
2026-11-18 16:32 ` [PATCH 3/3] submodule: accept a linked worktree as the submodule's git dir Adrian Ratiu
2026-11-18 19:52 ` Junio C Hamano [this message]
2026-11-19 12:19 ` 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=xmqqv75t534o.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=adrian.ratiu@collabora.com \
--cc=git@vger.kernel.org \
--cc=gonsolo@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.