Checkout branch before rebase in switch_version

reviewable/pr18780/r1
Stephen Fromm 12 years ago
parent d6f7ffd4bc
commit 3ec51ce587

4
git

@ -182,6 +182,10 @@ def switch_version(module, dest, remote, version):
cmd = "git checkout --force %s" % version
else:
# 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
return _run(cmd)

Loading…
Cancel
Save