Validate submodule names on every module path branch · gitpython-developers/GitPython@4299c99 · GitHub

gitpython-developers / GitPython Public

• Notifications You must be signed in to change notification settings
• Fork 989
• Star 5.2k

• Code
• Issues 8
• Pull requests 2
• Discussions
• Actions
• Security and quality 34
• Insights

Additional navigation options

Commit 4299c99

Browse filesBrowse the repository at this point in the historyBrowse files

Byron

and

codex

committed

Validate submodule names on every module path branch

<!-- agent --> _module_abspath only validated names when Git used separate gitfile submodule directories, so legacy Git behavior could accept the same invalid name. Validate before selecting the Git-version-dependent path branch and cover the legacy branch explicitly. Git baseline: submodule.c at 883a47ef6496c96a5d6132ed8c87fcd44ebf8d1a validates submodule paths before filesystem operations. Assisted-by: GPT 5.6 Co-authored-by: GPT 5.6 <codex@openai.com>

1 parent b324c83 commit 4299c99
Copy full SHA for 4299c99

2 files changed

+6-1Lines changed: 6 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• git/objects/submodule
  • base.py
• test
  • test_submodule.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎git/objects/submodule/base.py‎

Copy file name to clipboardExpand all lines: git/objects/submodule/base.py

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -316,8 +316,9 @@ def _validated_name(cls, name: str) -> str:
316	316
317	317	@classmethod
318	318	def _module_abspath(cls, parent_repo: "Repo", path: PathLike, name: str) -> PathLike:
	319	+ name = cls._validated_name(name)
319	320	if cls._need_gitfile_submodules(parent_repo.git):
320		- return osp.join(parent_repo.git_dir, "modules", cls._validated_name(name))
	321	+ return osp.join(parent_repo.git_dir, "modules", name)
321	322	if parent_repo.working_tree_dir:
322	323	return osp.join(parent_repo.working_tree_dir, path)
323	324	raise NotADirectoryError()

Collapse file

‎test/test_submodule.py‎

Copy file name to clipboardExpand all lines: test/test_submodule.py

+4Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -971,6 +971,10 @@ def test_update_rejects_parent_component_in_name(self, rwdir):
971	971	with pytest.raises(ValueError, match="submodule name"):
972	972	Submodule._module_abspath(clone, "module", name)
973	973
	974	+ with mock.patch.object(Submodule, "_need_gitfile_submodules", return_value=False):
	975	+ with pytest.raises(ValueError, match="submodule name"):
	976	+ Submodule._module_abspath(clone, "module", "../module")
	977	+
974	978	@with_rw_directory
975	979	@_patch_git_config("protocol.file.allow", "always")
976	980	def test_root_update_keeps_going_after_invalid_submodule_name(self, rwdir):

0 commit comments

Comments

0 (0)