ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge pull request #1724 from sfromm/issue1722a

Browse source 
Further refine remote branch tracking in b1ec6e8
This commit is contained in:
Stephen Fromm 2012-12-04 17:15:44 -08:00
commit 65413dc778
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
library/git
View file

@ -197,14 +197,14 @@ def switch_version(module, dest, remote, version):
os.chdir(dest) os.chdir(dest)
cmd = '' cmd = ''
if version != 'HEAD': if version != 'HEAD':
if not is_local_branch(module, dest, version) and is_remote_branch(module, dest, remote, version): if is_remote_branch(module, dest, remote, version):
cmd = "git checkout --track -b %s %s/%s" % (version, remote, version) if not is_local_branch(module, dest, version):
elif is_local_branch(module, dest, version): cmd = "git checkout --track -b %s %s/%s" % (version, remote, version)
cmd = "git checkout --force %s" % version else:
(rc, out, err) = _run("git checkout --force %s" % version) (rc, out, err) = _run("git checkout --force %s" % version)
if rc != 0: if rc != 0:
module.fail_json(msg="Failed to checkout branch %s" % version) module.fail_json(msg="Failed to checkout branch %s" % version)
cmd = "git reset --hard %s/%s" % (remote, 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: