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

Find the actual commit annotated tags refer to instead of the tag object.

Browse source
This commit is contained in:
Antti Salminen 2014-05-09 09:53:11 +03:00 • committed by Matt Clay
parent ef88ff6dd8
commit 75e15e2ae9
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -322,6 +322,7 @@ def reset(git_path, module, dest):
def get_remote_head(git_path, module, dest, version, remote, bare): def get_remote_head(git_path, module, dest, version, remote, bare):
cloning = False cloning = False
cwd = None cwd = None
tag = False
if remote == module.params['repo']: if remote == module.params['repo']:
cloning = True cloning = True
else: else:
@ -336,7 +337,8 @@ def get_remote_head(git_path, module, dest, version, remote, bare):
elif is_remote_branch(git_path, module, dest, remote, version): elif is_remote_branch(git_path, module, dest, remote, version):
cmd = '%s ls-remote %s -h refs/heads/%s' % (git_path, remote, version) cmd = '%s ls-remote %s -h refs/heads/%s' % (git_path, remote, version)
elif is_remote_tag(git_path, module, dest, remote, version): elif is_remote_tag(git_path, module, dest, remote, version):
cmd = '%s ls-remote %s -t refs/tags/%s' % (git_path, remote, version) tag = True
cmd = '%s ls-remote %s -t refs/tags/%s*' % (git_path, remote, version)
else: else:
# appears to be a sha1. return as-is since it appears # appears to be a sha1. return as-is since it appears
# cannot check for a specific sha1 on remote # cannot check for a specific sha1 on remote
@ -344,6 +346,16 @@ def get_remote_head(git_path, module, dest, version, remote, bare):
(rc, out, err) = module.run_command(cmd, check_rc=True, cwd=cwd) (rc, out, err) = module.run_command(cmd, check_rc=True, cwd=cwd)
if len(out) < 1: if len(out) < 1:
module.fail_json(msg="Could not determine remote revision for %s" % version) module.fail_json(msg="Could not determine remote revision for %s" % version)
if tag:
# Find the dereferenced tag if this is an annotated tag.
for tag in out.split('\n'):
if tag.endswith(version + '^{}'):
out = tag
break
elif tag.endswith(version):
out = tag
rev = out.split()[0] rev = out.split()[0]
return rev return rev