diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-11 13:21:55 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-11 13:22:28 +0300 |
| commit | 41d9cf225d3ed890fedaa03cdc4849b333cb0d0e (patch) | |
| tree | 7dd9b6057bcdd5f0d59aae01d89b49432fdf3aee /build_files/utils | |
| parent | 4b570f5b575e5a004326b8a6aa724bb0d26906a3 (diff) | |
Fix "make update" not using the right branch for source/tools
Diffstat (limited to 'build_files/utils')
| -rwxr-xr-x | build_files/utils/make_update.py | 6 |
1 files changed, 3 insertions, 3 deletions
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) |