From: Junio C Hamano <gitster@pobox.com>
To: K Jayatheerth <jayatheerthkulkarni2005@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v7 1/2] submodule: prevent overwriting .gitmodules entry on path reuse
Date: Tue, 27 May 2025 07:01:29 -0700 [thread overview]
Message-ID: <xmqqplfurw3q.fsf@gitster.g> (raw)
In-Reply-To: <20250524073628.58944-2-jayatheerthkulkarni2005@gmail.com> (K. Jayatheerth's message of "Sat, 24 May 2025 13:06:27 +0530")
K Jayatheerth <jayatheerthkulkarni2005@gmail.com> writes:
> @@ -3546,6 +3550,29 @@ static int module_add(int argc, const char **argv, const char *prefix,
> if(!add_data.sm_name)
> add_data.sm_name = add_data.sm_path;
>
> + existing = submodule_from_name(the_repository,
> + null_oid(the_hash_algo),
> + add_data.sm_name);
> +
> + if (existing && strcmp(existing->path, add_data.sm_path)) {
Looks quite straight-forward to me. Great.
> + if (!force) {
> + die(_("submodule name '%s' already used for path '%s'"),
> + add_data.sm_name, existing->path);
> + }
> +
> + /* --force: build <name><n> until unique */
> + for (i = 1; ; i++) {
> + strbuf_reset(&buf);
> + strbuf_addf(&buf, "%s%d", add_data.sm_name, i);
> + if (!submodule_from_name(the_repository,
> + null_oid(the_hash_algo),
> + buf.buf)) {
> + break;
> + }
> + }
> +
> + add_data.sm_name = sm_name_to_free = strbuf_detach(&buf, NULL);
> + }
next prev parent reply other threads:[~2025-05-27 14:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-24 7:36 [PATCH v7 0/2] Avoid submodule overwritten and skip redundant active entries K Jayatheerth
2025-05-24 7:36 ` [PATCH v7 1/2] submodule: prevent overwriting .gitmodules entry on path reuse K Jayatheerth
2025-05-27 14:01 ` Junio C Hamano [this message]
2025-05-24 7:36 ` [PATCH v7 2/2] submodule: skip redundant active entries when pattern covers path K Jayatheerth
2025-05-27 14:42 ` Junio C Hamano
2025-05-29 4:23 ` JAYATHEERTH K
2025-06-04 4:22 ` Junio C Hamano
2025-06-06 14:41 ` JAYATHEERTH K
2025-06-08 3:27 ` [PATCH v8 0/2] Avoid submodule overwritten and skip redundant active entries K Jayatheerth
2025-06-08 3:27 ` [PATCH v8 1/2] submodule: prevent overwriting .gitmodules entry on path reuse K Jayatheerth
2025-07-09 2:50 ` D. Ben Knoble
2025-07-20 12:25 ` JAYATHEERTH K
2025-07-25 17:28 ` Ben Knoble
2025-06-08 3:27 ` [PATCH v8 2/2] submodule: skip redundant active entries when pattern covers path K Jayatheerth
2025-07-09 2:50 ` D. Ben Knoble
2025-07-09 14:52 ` Junio C Hamano
2025-07-17 16:58 ` Junio C Hamano
2025-07-18 14:24 ` JAYATHEERTH K
2025-07-07 22:34 ` [PATCH v8 0/2] Avoid submodule overwritten and skip redundant active entries Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqplfurw3q.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jayatheerthkulkarni2005@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).