cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Further refine remote branch tracking in b1ec6e8

Browse source 
Move operations that are dependant on a remote branch under a if
is_remote_branch() conditional.  While at it, remove assignment to cmd
string in same block that wasn't used when calling _run().
This commit is contained in:
Stephen Fromm 2012-12-04 17:02:54 -08:00
parent feb5705017
commit 84264009b5
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
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: