Skip to content

Handle invalid submodule names during recursive updates #2205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Byron merged 2 commits into from
Aug 4, 2026
+9 −12
Merged

Handle invalid submodule names during recursive updates #2205

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b324c83
Initialize submodule repository before handled failures
Byron Aug 4, 2026
4299c99
Validate submodule names on every module path branch
Byron Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Initialize submodule repository before handled failures 
<!-- agent -->
Direct recursive updates with keep_going could swallow an invalid-name
validation error and then access mrepo before assignment. Reproduce that
path and initialize mrepo before validation so recursion is safely skipped.

Git baseline: submodule.c at 883a47ef6496c96a5d6132ed8c87fcd44ebf8d1a
validates submodule paths before operating on them.

Assisted-by: GPT 5.6
Co-authored-by: GPT 5.6 <codex@openai.com>
  • Loading branch information
@Byron @codex
Byron and codex committed Aug 4, 2026
commit b324c831cbc02c82b99c18113b622d03539d23cd
8 changes: 0 additions & 8 deletions .basedpyright/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,14 +491,6 @@
"lineCount": 1
}
},
{
"code": "reportPossiblyUnboundVariable",
"range": {
"startColumn": 15,
"endColumn": 20,
"lineCount": 1
}
},
{
"code": "reportArgumentType",
"range": {
Expand Down
4 changes: 1 addition & 3 deletions git/objects/submodule/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,9 +747,7 @@ def update(
prefix = "DRY-RUN: "
# END handle prefix

# To keep things plausible in dry-run mode.
if dry_run:
mrepo = None
mrepo = None
# END init mrepo

def fetch_remotes(module_repo: "Repo") -> None:
Expand Down
2 changes: 2 additions & 0 deletions test/test_submodule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,6 +994,8 @@ def test_root_update_keeps_going_after_invalid_submodule_name(self, rwdir):
assert not clone.submodule("../invalid").module_exists()
assert clone.submodule("valid").module_exists()

clone.submodule("../invalid").update(recursive=True, keep_going=True)

@with_rw_directory
@_patch_git_config("protocol.file.allow", "always")
def test_list_only_valid_submodules(self, rwdir):
Expand Down