griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Don't update submodules that we shouldn't checkout

Browse Source 
There were a logic error in make update where we would fetch data from
submodules when not referenced in our local git config.

Fixes part of #139328.

Pull Request: https://projects.blender.org/blender/blender/pulls/139350
This commit is contained in:
Sebastian Parborg
2025-05-23 15:34:29 +02:00
committed by Brecht Van Lommel
parent 6b1ef63f4d
commit 09766d1996
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/utils/make_utils.py
View File

@@ -215,7 +215,11 @@ def is_git_submodule_enabled(git_command: str, submodule_dir: Path) -> bool:
update = check_output(
(git_command, "config", "--local", _git_submodule_config_key(submodule_dir, "update")),
exit_on_error=False)
if update == "":
# The repo is not in our local config. Check the default .gitmodules setting.
update = check_output(
(git_command, "config", "--file", str(gitmodules), _git_submodule_config_key(submodule_dir, "update")),
exit_on_error=False)
return update.lower() != "none"