blender
/
blender
134
399
Fork 582
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

Fix issue in "make update" checking out submodule branch on buildbot

This commit is contained in:
Brecht Van Lommel 2019-10-11 13:11:10 +02:00
parent 3f97d62072
commit 2b35ee3ea2
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build_files/utils/make_update.py
View File

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