]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ar/submodule-gitdir-tweak' into jch
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Dec 2025 02:33:35 +0000 (11:33 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Dec 2025 02:33:35 +0000 (11:33 +0900)
Avoid local submodule repository directory paths overlapping with
each other by encoding submodule names before using them as path
components.

Comments?

* ar/submodule-gitdir-tweak:
  submodule: detect conflicts with existing gitdir configs
  submodule: hash the submodule name for the gitdir path
  submodule: fix case-folding gitdir filesystem collisions
  submodule--helper: fix filesystem collisions by encoding gitdir paths
  builtin/credential-store: move is_rfc3986_unreserved to url.[ch]
  submodule--helper: add gitdir migration command
  submodule: allow runtime enabling extensions.submodulePathConfig
  submodule: introduce extensions.submodulePathConfig
  builtin/submodule--helper: add gitdir command
  submodule: always validate gitdirs inside submodule_name_to_gitdir
  submodule--helper: use submodule_name_to_gitdir in add_submodule

1  2 
builtin/submodule--helper.c
repository.c
repository.h
setup.c
setup.h
submodule.c
t/meson.build

Simple merge
diff --cc repository.c
Simple merge
diff --cc repository.h
Simple merge
diff --cc setup.c
Simple merge
diff --cc setup.h
Simple merge
diff --cc submodule.c
Simple merge
diff --cc t/meson.build
Simple merge