kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merge branch 'blender-v3.5-release'

Browse Source
This commit is contained in:
Sergey Sharybin 2023-02-24 17:09:29 +01:00
commit 12cc3ccd72
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_files/utils/make_update.py
View File

@ -434,7 +434,10 @@ def external_scripts_update(args: argparse.Namespace,
# Switch to branch and pull. # Switch to branch and pull.
if submodule_branch: if submodule_branch:
if make_utils.git_branch(args.git_command) != submodule_branch: if make_utils.git_branch(args.git_command) != submodule_branch:
call([args.git_command, "checkout", submodule_branch]) if make_utils.git_remote_exist(args.git_command, "origin"):
call([args.git_command, "checkout", "-t", f"origin/{submodule_branch}"])
elif make_utils.git_remote_exist(args.git_command, "upstream"):
call([args.git_command, "checkout", "-t", f"upstream/{submodule_branch}"])
# Don't use extra fetch since all remotes of interest have been already fetched # Don't use extra fetch since all remotes of interest have been already fetched
# some lines above. # some lines above.
skip_msg += work_tree_update(args, use_fetch=False) skip_msg += work_tree_update(args, use_fetch=False)