From 11895fa43734ce246a7bf64746df618540251c1f Mon Sep 17 00:00:00 2001 From: addshore Date: Mon, 20 Jan 2014 00:54:53 +0100 Subject: [PATCH] Add --remote to git submodule_update This simply adds --remote to the git submodule update command. This means that if a branch is defined in .gitmodules then we should track said branch when updating. --- library/source_control/git | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/source_control/git b/library/source_control/git index 29dd8489f68..8acd817b8ed 100644 --- a/library/source_control/git +++ b/library/source_control/git @@ -376,8 +376,8 @@ def submodule_update(git_path, module, dest): return (0, '', '') cmd = [ git_path, 'submodule', 'sync' ] (rc, out, err) = module.run_command(cmd, check_rc=True, cwd=dest) - cmd = [ git_path, 'submodule', 'update', '--init', '--recursive' ] - (rc, out, err) = module.run_command(cmd, cwd=dest) + cmd = [ git_path, 'submodule', 'update', '--init', '--recursive' ,'--remote' ] + (rc, out, err) = module.run_command(cmd) if rc != 0: module.fail_json(msg="Failed to init/update submodules") return (rc, out, err)