From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender4-op-o12.zoho.com (sender4-op-o12.zoho.com [136.143.188.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0BA3C2EF64F for ; Wed, 19 Nov 2025 21:11:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.12 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763586697; cv=pass; b=OY1/v9+0mCZu1dcjsrpaAwy/YZwqpOzU5A1XHDdECI8F/m9QCjO7k7lX3iUYz46MXUUhsOs8fRNAQoVXLzTOwQKDzhWUDGaVGgnjQoESz0PSjRfLNJYbT9dcgymPgV6I3es8Uiqp5lyIioyJkP82zP7KPoMW4cMpts4IxxKoPI8= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763586697; c=relaxed/simple; bh=TAufOcCoPQRLZT4abWa7F1H7K/VCXFu1kIW39fLCsIU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CtOQmzFxE+AL7jmNWqJly3aj7lbzcSADN6a7YfwigNI20oCZTF9kOU+ChxNMjSyQA3os+c7JNh/Xnsee7hf1+lXy/x4BHWEWWTqxeAE7qg7tUfLL/2iw7YZWN1C0yPGQEwaLwN4/jTvt+HXxUsSop2yfKg5H5ibiiGrKjXlG11Y= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.ratiu@collabora.com header.b=IreY7AZe; arc=pass smtp.client-ip=136.143.188.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.ratiu@collabora.com header.b="IreY7AZe" ARC-Seal: i=1; a=rsa-sha256; t=1763586674; cv=none; d=zohomail.com; s=zohoarc; b=SQERUkm18NNFp4sJTvPA7DjcpXT0FM/I7IS/cwCyU/g5EkKpaZxufGTo/dE/5rkjLwJq6d8VaUeg0WfqAJqvKj8xlct2bjubwJV195dGfF0UTL0rdpGLtoQC4+gJfPasz1S6JS93lzb+pCO1Q50Ykv6rBtVTe6xIHNcRIxqW5Hg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763586674; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=bdYcBaXWF6RY5d33R2D3Rr+o2HeG8Vf+6CIUitXG730=; b=FvrTzGzPiVqO2gFqPc1Rxv8kOaQB2Bc4yy0aiDhUCHNUelyekO7r1KBJhyEGNw8smjpIpmi27RTqpbmXXhrZuoO4d17k2AJ1zBEQlu5TtNdbziWAJZlVmjb7AcqqrTqYseutz1TCIZov6Q2fv9BtFCzK8yCXvAog1BjZKy4IWDQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.ratiu@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1763586674; s=zohomail; d=collabora.com; i=adrian.ratiu@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=bdYcBaXWF6RY5d33R2D3Rr+o2HeG8Vf+6CIUitXG730=; b=IreY7AZeoNyqjJ/vaB8JlVDa7nbVkPkbiOl6LsAgnBOkZECxbvuLKgpPrIyTlhWx QhXfrasVd7pVEUOQZvgKQIbUgymxCOMvp0f+Ze88yPVIInqAyYnTA1Ss6HSaoSMtRXi y1vG/12+NRkGoUrh96Oe04RbE9GJWJXZLfgPyxC8= Received: by mx.zohomail.com with SMTPS id 1763586673486751.6273137708782; Wed, 19 Nov 2025 13:11:13 -0800 (PST) From: Adrian Ratiu To: git@vger.kernel.org Cc: Emily Shaffer , Rodrigo Damazio Bovendorp , Jeff King , Junio C Hamano , Aaron Schrab , Jonathan Nieder , Patrick Steinhardt , Josh Steadmon , Ben Knoble , Phillip Wood , Adrian Ratiu Subject: [PATCH v5 1/7] submodule--helper: use submodule_name_to_gitdir in add_submodule Date: Wed, 19 Nov 2025 23:10:24 +0200 Message-ID: <20251119211030.2008441-2-adrian.ratiu@collabora.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251119211030.2008441-1-adrian.ratiu@collabora.com> References: <20250816213642.3517822-1-adrian.ratiu@collabora.com> <20251119211030.2008441-1-adrian.ratiu@collabora.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External While testing submodule gitdir path encoding, I noticed submodule--helper is still using a hardcoded modules gitdir path leading to test failures. Call the submodule_name_to_gitdir() helper instead, which was invented exactly for this purpose and is already used by all the other locations which work on gitdirs. Also narrow the scope of the submod_gitdir_path variable which is not used anymore in the updated "else" branch. Signed-off-by: Adrian Ratiu --- builtin/submodule--helper.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index fcd73abe53..2873b2780e 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -3187,13 +3187,13 @@ static void append_fetch_remotes(struct strbuf *msg, const char *git_dir_path) static int add_submodule(const struct add_data *add_data) { - char *submod_gitdir_path; struct module_clone_data clone_data = MODULE_CLONE_DATA_INIT; struct string_list reference = STRING_LIST_INIT_NODUP; int ret = -1; /* perhaps the path already exists and is already a git repo, else clone it */ if (is_directory(add_data->sm_path)) { + char *submod_gitdir_path; struct strbuf sm_path = STRBUF_INIT; strbuf_addstr(&sm_path, add_data->sm_path); submod_gitdir_path = xstrfmt("%s/.git", add_data->sm_path); @@ -3207,10 +3207,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); - if (is_directory(submod_gitdir_path)) { + if (is_directory(submod_gitdir.buf)) { if (!add_data->force) { struct strbuf msg = STRBUF_INIT; char *die_msg; @@ -3219,8 +3220,8 @@ static int add_submodule(const struct add_data *add_data) "locally with remote(s):\n"), add_data->sm_name); - append_fetch_remotes(&msg, submod_gitdir_path); - free(submod_gitdir_path); + append_fetch_remotes(&msg, submod_gitdir.buf); + strbuf_release(&submod_gitdir); strbuf_addf(&msg, _("If you want to reuse this local git " "directory instead of cloning again from\n" @@ -3238,7 +3239,7 @@ static int add_submodule(const struct add_data *add_data) "submodule '%s'\n"), add_data->sm_name); } } - free(submod_gitdir_path); + strbuf_release(&submod_gitdir); clone_data.prefix = add_data->prefix; clone_data.path = add_data->sm_path; -- 2.51.0