From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jun 2025 16:49:35 +0000 (-0700)
Subject: Merge branch 'kj/renamed-submodule' into jch
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13458e4669887253e0dff0e9dedfdcb2dd9065a1;p=thirdparty%2Fgit.git

Merge branch 'kj/renamed-submodule' into jch

The case where a new submodule takes a path where used to be a
completely different subproject is now dealt a bit better than
before.

Comments?

* kj/renamed-submodule:
  submodule: skip redundant active entries when pattern covers path
  submodule: prevent overwriting .gitmodules entry on path reuse
---

13458e4669887253e0dff0e9dedfdcb2dd9065a1