internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 05:12:45 +00:00
Code Issues Packages 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
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
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)