[Bf-blender-cvs] [41d9cf225d3] master: Fix "make update" not using the right branch for source/tools

Brecht Van Lommel noreply at git.blender.org
Fri Oct 11 12:23:09 CEST 2019


Commit: 41d9cf225d3ed890fedaa03cdc4849b333cb0d0e
Author: Brecht Van Lommel
Date:   Fri Oct 11 12:21:55 2019 +0200
Branches: master
https://developer.blender.org/rB41d9cf225d3ed890fedaa03cdc4849b333cb0d0e

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

===================================================================

M	build_files/utils/make_update.py

===================================================================

diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py
index d0c20d166c9..3e91a43afd3 100755
--- a/build_files/utils/make_update.py
+++ b/build_files/utils/make_update.py
@@ -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)



More information about the Bf-blender-cvs mailing list