Brandon Williams <bmwill@xxxxxxxxxx> writes:
> Introduce a helper function "submodule_name_to_gitdir()" (and the
> submodule--helper subcommand "gitdir") which constructs a path to a
> submodule's gitdir, located in the provided repository's "modules"
> directory.
>
> This consolidates the logic needed to build up a path into a
> repository's "modules" directory, abstracting away the fact that
> submodule git directories are stored in a repository's common gitdir.
> This makes it easier to adjust how submodules gitdir are stored in the
> "modules" directory in a future patch.
>
> Signed-off-by: Brandon Williams <bmwill@xxxxxxxxxx>
> ---
> ...
> @@ -2018,7 +2039,7 @@ static int connect_gitdir_workingtree(int argc, const char **argv, const char *p
> name = argv[1];
> path = argv[2];
>
> - strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name);
> + submodule_name_to_gitdir(&sb, the_repository, name);
> sm_gitdir = absolute_pathdup(sb.buf);
>
> connect_work_tree_and_git_dir(path, sm_gitdir, 0);
This function goes away with 1c866b98 ("submodule--helper: replace
connect-gitdir-workingtree by ensure-core-worktree", 2018-08-03) in
sb/submodule-update-in-c topic. git-submodule.sh has simlar
conflicts.
I guess its replacement function does not care as deeply as its
predecessor used to about where the submodule's $GIT_DIR is, so the
correct resolution may be just to ignore the change made to this
caller to the new name-to-gitdir function.
It would have been nicer to see a bit better inter-developer
coordination, especially between two who sit practically next to
each other ;-)
Thanks.
