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

Checkout branch before rebase in switch_version

Browse source
This commit is contained in:
Stephen Fromm 2012-10-23 23:34:53 -07:00
parent ccc04cf891
commit 328951ef53
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/git
View file

@ -182,6 +182,10 @@ def switch_version(module, dest, remote, version):
cmd = "git checkout --force %s" % version cmd = "git checkout --force %s" % version
else: else:
# is there a better way to do this? # is there a better way to do this?
branch = get_head_branch(module, dest, remote)
(rc, out, err) = _run("git checkout --force %s" % branch)
if rc != 0:
module.fail_json(msg="Failed to checkout branch %s" % branch)
cmd = "git rebase %s" % remote cmd = "git rebase %s" % remote
return _run(cmd) return _run(cmd)