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

Add comment

Browse source
This commit is contained in:
Toshio Kuratomi 2016-06-21 09:25:55 -07:00 committed by Matt Clay
parent 3a8a11d85f
commit eadef56a06
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/source_control/git.py
View file

@ -812,6 +812,7 @@ def main():
# if force and in non-check mode, do a reset # if force and in non-check mode, do a reset
if not module.check_mode: if not module.check_mode:
reset(git_path, module, dest) reset(git_path, module, dest)
# exit if already at desired sha version # exit if already at desired sha version
set_remote_url(git_path, module, repo, dest, remote) set_remote_url(git_path, module, repo, dest, remote)
remote_head = get_remote_head(git_path, module, dest, version, remote, bare) remote_head = get_remote_head(git_path, module, dest, version, remote, bare)
@ -820,6 +821,8 @@ def main():
module.exit_json(changed=True, before=before, after=remote_head, module.exit_json(changed=True, before=before, after=remote_head,
msg="Local modifications exist") msg="Local modifications exist")
elif version == 'HEAD': elif version == 'HEAD':
# If the remote and local match and we're using the default of
# HEAD (It's not a real tag) then exit early
repo_updated = False repo_updated = False
elif is_remote_tag(git_path, module, dest, repo, version): elif is_remote_tag(git_path, module, dest, repo, version):
# if the remote is a tag and we have the tag locally, exit early # if the remote is a tag and we have the tag locally, exit early
@ -829,6 +832,7 @@ def main():
# if the remote is a branch and we have the branch locally, exit early # if the remote is a branch and we have the branch locally, exit early
if version in get_branches(git_path, module, dest): if version in get_branches(git_path, module, dest):
repo_updated = False repo_updated = False
if repo_updated is None: if repo_updated is None:
if module.check_mode: if module.check_mode:
module.exit_json(changed=True, before=before, after=remote_head) module.exit_json(changed=True, before=before, after=remote_head)