mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge pull request #1723 from sfromm/issue1722
Fix git module to update branch to latest when using version=<branch>
This commit is contained in:
commit
1d910bb4e3
1 changed files with 6 additions and 0 deletions
|
@ -199,6 +199,12 @@ def switch_version(module, dest, remote, version):
|
||||||
if version != 'HEAD':
|
if version != 'HEAD':
|
||||||
if not is_local_branch(module, dest, version) and is_remote_branch(module, dest, remote, version):
|
if not is_local_branch(module, dest, version) and is_remote_branch(module, dest, remote, version):
|
||||||
cmd = "git checkout --track -b %s %s/%s" % (version, remote, version)
|
cmd = "git checkout --track -b %s %s/%s" % (version, remote, version)
|
||||||
|
elif is_local_branch(module, dest, version):
|
||||||
|
cmd = "git checkout --force %s" % version
|
||||||
|
(rc, out, err) = _run("git checkout --force %s" % version)
|
||||||
|
if rc != 0:
|
||||||
|
module.fail_json(msg="Failed to checkout branch %s" % version)
|
||||||
|
cmd = "git reset --hard %s/%s" % (remote, version)
|
||||||
else:
|
else:
|
||||||
cmd = "git checkout --force %s" % version
|
cmd = "git checkout --force %s" % version
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in a new issue