bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix "make update" not using the right branch for source/tools

Browse Source
This commit is contained in:
Brecht Van Lommel 2019-10-11 12:21:55 +02:00
parent 4b570f5b57
commit 41d9cf225d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/utils/make_update.py
View File

@ -180,9 +180,9 @@ def submodules_update(args, release_version, branch):
if msg:
skip_msg += submodule_path + " skipped: " + msg + "\n"
else:
if make_utils.git_branch(args.git_command) != branch:
call([args.git_command, "checkout", branch])
call([args.git_command, "pull", "--rebase", "origin", branch])
if make_utils.git_branch(args.git_command) != submodule_branch:
call([args.git_command, "checkout", submodule_branch])
call([args.git_command, "pull", "--rebase", "origin", submodule_branch])
finally:
os.chdir(cwd)