From: K Jayatheerth <jayatheerthkulkarni2005@gmail•com>
To: git@vger•kernel.org
Cc: gitster@pobox•com, K Jayatheerth <jayatheerthkulkarni2005@gmail•com>
Subject: [PATCH v7 0/2] Avoid submodule overwritten and skip redundant active entries
Date: Sat, 24 May 2025 13:06:26 +0530 [thread overview]
Message-ID: <20250524073628.58944-1-jayatheerthkulkarni2005@gmail.com> (raw)
This series of patch covers mainly two areas
1. The bug report where after submodule was moved and the path remained same
when a new submodule was added then it directly was overwriting the
moved submodule as the present submodule since the path matched.
2. The configure_added_submodule was writing submodule.<name>.active
entry, even when the new path is already matched by submodule.active
patterns.
Below is a helper function and 2 new tests with fixes of the above problem.
K Jayatheerth (2):
submodule: prevent overwriting .gitmodules entry on path reuse
submodule: skip redundant active entries when pattern covers path
builtin/submodule--helper.c | 60 +++++++++++++++++++++++++++-------
t/t7400-submodule-basic.sh | 23 +++++++++++++
t/t7413-submodule-is-active.sh | 15 +++++++++
3 files changed, 87 insertions(+), 11 deletions(-)
--
2.49.GIT
next reply other threads:[~2025-05-24 7:36 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-24 7:36 K Jayatheerth [this message]
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
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
-- strict thread matches above, loose matches on Subject: below --
2025-05-24 6:54 [PATCH v6 2/2] submodule: skip redundant active entries when pattern covers path JAYATHEERTH K
2025-05-24 7:30 ` [PATCH v7 0/2] Avoid submodule overwritten and skip redundant active entries K Jayatheerth
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=20250524073628.58944-1-jayatheerthkulkarni2005@gmail.com \
--to=jayatheerthkulkarni2005@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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