Re: [PATCH 2/3] worktree: add --recurse-submodules flag to worktree add
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 16, 2026, 17:27 UTC
- Message-ID
- <xmqqpl3y24ub.fsf@gitster.g>
- In-Reply-To
- <aeEPk7m5gwPnmMUZ@RTX>
Jimmy Aguilar Mena <kratsbinovish@gmail.com> writes:
Show 10 quoted lines
> + /*
> + * If we are populating a submodule in a linked worktree and the main
> + * worktree already has this submodule cloned, reuse its objects via a
> + * local clone (hardlinks) instead of fetching from the network. The
> + * common-dir path "$GIT_COMMON_DIR/modules/<name>" is where the main
> + * worktree stores the submodule gitdir; the per-worktree path returned
> + * by submodule_name_to_gitdir() diverges from it only in linked
> + * worktrees.
> + */
> + {I think you identified the right place to hook into. But instead of "clone --local", shoudln't you be running "git worktree add" here?
"clone --local" means you have two logically separate repositories for this single submodule that are used by two worktrees of the superproject. If you add a new commit to one, shouldn't that commit become available in the other? Two separate repositories created by "clone --local" will not allow you to do so.
Show 54 quoted lines
> + struct strbuf common_sm_gitdir = STRBUF_INIT;
> + strbuf_addf(&common_sm_gitdir, "%s/modules/%s",
> + the_repository->commondir, clone_data->name);
> +
> + if (!file_exists(sm_gitdir) &&
> + strcmp(sm_gitdir, common_sm_gitdir.buf) &&
> + is_git_directory(common_sm_gitdir.buf)) {
> + /*
> + * Main worktree has the submodule; reuse it locally.
> + * git clone --local creates hardlinks for pack files so
> + * no extra disk space is needed for existing objects.
> + */
> + if (clone_data->require_init && !stat(clone_data_path, &st) &&
> + !is_empty_dir(clone_data_path))
> + die(_("directory not empty: '%s'"), clone_data_path);
> +
> + if (safe_create_leading_directories_const(the_repository, sm_gitdir) < 0)
> + die(_("could not create directory '%s'"), sm_gitdir);
> +
> + strvec_push(&cp.args, "clone");
> + strvec_push(&cp.args, "--local");
> + strvec_push(&cp.args, "--no-checkout");
> + if (clone_data->quiet)
> + strvec_push(&cp.args, "--quiet");
> + strvec_pushl(&cp.args, "--separate-git-dir", sm_gitdir, NULL);
> + strvec_push(&cp.args, "--");
> + strvec_push(&cp.args, common_sm_gitdir.buf);
> + strvec_push(&cp.args, clone_data_path);
> +
> + cp.git_cmd = 1;
> + prepare_submodule_repo_env(&cp.env);
> + cp.no_stdin = 1;
> +
> + if (run_command(&cp))
> + die(_("local clone of '%s' into submodule path '%s' failed"),
> + common_sm_gitdir.buf, clone_data_path);
> +
> + strbuf_release(&common_sm_gitdir);
> + goto connect_wt;
> + }
> + strbuf_release(&common_sm_gitdir);
> + }
> +
> if (!file_exists(sm_gitdir)) {
> if (clone_data->require_init && !stat(clone_data_path, &st) &&
> !is_empty_dir(clone_data_path))
> @@ -2005,6 +2058,7 @@ static int clone_submodule(const struct module_clone_data *clone_data,
> sm_gitdir);
> }
>
> +connect_wt:
> connect_work_tree_and_git_dir(clone_data_path, sm_gitdir, 0);
>
> p = repo_submodule_path(the_repository, clone_data_path, "config");