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 7E4DD285CAA for ; Sat, 13 Dec 2025 08:09:11 +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=1765613354; cv=pass; b=lOcAaaav8eXZTIwvj/xcmqMUWHULdx42TDa0RctJsq4wV3XHyjO0iS2AMxnqrkEt9j+t+IRdgJcU1G55ODybUkn/ugnkmx+auYc5pG0qvo0af6q89bx02sEK7aY4H+cHcI6qL4NJg00aI3u0qILXbDhKpt9y17YNrUj/u5h3Y+E= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765613354; c=relaxed/simple; bh=u5feBEqlEcgvbNz+KJnO80jB3CiMRihm5u3fvy6cCUA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SG4Nz2Zb4D9Hm6aES/Za+v0nTZA3/LUYNn5C2cr4QXwh+YK8hjGYllHqnIPpRfq1+yX2PZtjmmHKqZrvyyknkls//GZshJXCbotM8WnUIZtO23PuAcCjw8wL/XFyZknjJDVHpS0gtQbIfizS1WyyC1zAS76o7T9bm8zvdLFF7w8= 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=PS5ers7q; 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="PS5ers7q" ARC-Seal: i=1; a=rsa-sha256; t=1765613337; cv=none; d=zohomail.com; s=zohoarc; b=APMVwk+r+E69XvtXne3zcIBCDr1YAFmaIHpU21jkbva3yoTRlCY6Cw02kXe3+jdyY6cbizCtOwo9RKJjZFgrKYl09FJmbMtrqWqMm7ORVM1UUrKr+0gv4mEo/lokkNgJyqlaQmZGYogFsBZx1unw5zSAQ1KQfIrb9FczSkedxHI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765613337; 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=spoBC+T/1BHjti/FhJgnBYjbgSlOzZjhjyTweSQpE28=; b=mAgUfl3tJ7GIabWYzlWH43mDGDH8+cdUs94JO0KQrxP1oXwgQ4ChabiTUW9i1cNXffruphEA+N7/AP/rrOQTTXEy8ajRzJZ/7zsRdGOmT23iMkBypfeocrqUOqTFNo5lXaKupzhHpSUfrPLR4z3q8wNflNPDFjeK+UZv0gcWDx8= 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=1765613337; 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=spoBC+T/1BHjti/FhJgnBYjbgSlOzZjhjyTweSQpE28=; b=PS5ers7qTNfUJd1nYTniH+sbZvqDIspWOVAcaEvUlnqapCnOk5r0YQomyMa2NiBb +mJqWsjbXfYnCe/iF71TkcfkDoXhtoPcQeABCwWipGk0Ehcq4HBE52bPm5jfAESlllI LuN5PhyszTdWyCFL4pqD0aBe8jHIXPI8TV9oWq0Q= Received: by mx.zohomail.com with SMTPS id 1765613335699681.2424158878174; Sat, 13 Dec 2025 00:08:55 -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 v6 02/10] submodule: always validate gitdirs inside submodule_name_to_gitdir Date: Sat, 13 Dec 2025 10:08:08 +0200 Message-ID: <20251213080817.347922-3-adrian.ratiu@collabora.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251213080817.347922-1-adrian.ratiu@collabora.com> References: <20250816213642.3517822-1-adrian.ratiu@collabora.com> <20251213080817.347922-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 Move the ad-hoc validation checks sprinkled across the source tree, after calling submodule_name_to_gitdir() into the function proper, which now always validates the gitdir before returning it. This simplifies the API and helps to: 1. Avoid redundant validation calls after submodule_name_to_gitdir(). 2. Avoid the risk of callers forgetting to validate. 3. Ensure gitdir paths provided by users via configs are always valid (config gitdir paths are added in a subsequent commit). The validation function can still be called as many times as needed outside submodule_name_to_gitdir(), for example we keep two calls which are still required, to avoid parallel clone races by re-running the validation in builtin/submodule-helper.c. Signed-off-by: Adrian Ratiu --- builtin/submodule--helper.c | 4 ---- submodule.c | 12 ++++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 13b5e4ed68..f1fc098614 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -1699,10 +1699,6 @@ static int clone_submodule(const struct module_clone_data *clone_data, clone_data_path = to_free = xstrfmt("%s/%s", repo_get_work_tree(the_repository), clone_data->path); - if (validate_submodule_git_dir(sm_gitdir, clone_data->name) < 0) - die(_("refusing to create/use '%s' in another submodule's " - "git dir"), sm_gitdir); - if (!file_exists(sm_gitdir)) { if (clone_data->require_init && !stat(clone_data_path, &st) && !is_empty_dir(clone_data_path)) diff --git a/submodule.c b/submodule.c index 40a5c6fb9d..f645372a18 100644 --- a/submodule.c +++ b/submodule.c @@ -2166,11 +2166,6 @@ int submodule_move_head(const char *path, const char *super_prefix, struct strbuf gitdir = STRBUF_INIT; submodule_name_to_gitdir(&gitdir, the_repository, sub->name); - if (validate_submodule_git_dir(gitdir.buf, - sub->name) < 0) - die(_("refusing to create/use '%s' in another " - "submodule's git dir"), - gitdir.buf); connect_work_tree_and_git_dir(path, gitdir.buf, 0); strbuf_release(&gitdir); @@ -2349,9 +2344,6 @@ static void relocate_single_git_dir_into_superproject(const char *path, die(_("could not lookup name for submodule '%s'"), path); submodule_name_to_gitdir(&new_gitdir, the_repository, sub->name); - if (validate_submodule_git_dir(new_gitdir.buf, sub->name) < 0) - die(_("refusing to move '%s' into an existing git dir"), - real_old_git_dir); if (safe_create_leading_directories_const(the_repository, new_gitdir.buf) < 0) die(_("could not create directory '%s'"), new_gitdir.buf); real_new_git_dir = real_pathdup(new_gitdir.buf, 1); @@ -2600,4 +2592,8 @@ void submodule_name_to_gitdir(struct strbuf *buf, struct repository *r, */ repo_git_path_append(r, buf, "modules/"); strbuf_addstr(buf, submodule_name); + + if (validate_submodule_git_dir(buf->buf, submodule_name) < 0) + die(_("refusing to create/use '%s' in another submodule's " + "git dir"), buf->buf); } -- 2.51.2