From: Adrian Ratiu Date: Thu, 21 Aug 2025 11:26:22 GMT Subject: Re: [PATCH 1/9] submodule--helper: use submodule_name_to_gitdir in add_submodule Message-ID: <877byw9aqp.fsf@collabora.com> In-Reply-To: On Wed, 20 Aug 2025, Josh Steadmon wrote: > On 2025.08.17 00:36, Adrian Ratiu wrote: >> While testing submodule gitdir path encoding, I noticed submodule--helper >> is still using a hardcoded name-based path leading to test failures, so >> convert it to the common helper function introduced by commit ce125d431a >> ("submodule: extract path to submodule gitdir func") and used in other >> locations accross the source tree. >> >> Signed-off-by: Adrian Ratiu >> --- >> builtin/submodule--helper.c | 11 ++++++----- >> 1 file changed, 6 insertions(+), 5 deletions(-) >> >> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c >> index 07a1935cbe..7243429c6f 100644 >> --- a/builtin/submodule--helper.c >> +++ b/builtin/submodule--helper.c >> @@ -3213,10 +3213,11 @@ static int add_submodule(const struct add_data *add_data) >> free(submod_gitdir_path); >> } else { >> struct child_process cp = CHILD_PROCESS_INIT; >> + struct strbuf submod_gitdir = STRBUF_INIT; >> >> - submod_gitdir_path = xstrfmt(".git/modules/%s", add_data->sm_name); >> + submodule_name_to_gitdir(&submod_gitdir, the_repository, add_data->sm_name); > > I believe submod_gitdir_path is now only used in the `if (...) {...}` > side corresponding to this `else` branch, so perhaps we should make it > local to that block? Yes, I'll move it in v2. Thanks!