From 41d9cf225d3ed890fedaa03cdc4849b333cb0d0e Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 11 Oct 2019 12:21:55 +0200 Subject: Fix "make update" not using the right branch for source/tools --- build_files/utils/make_update.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build_files/utils') 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) -- cgit v1.2.3