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

Merge pull request #9776 from MiLk/fixes/git-repo-info-branch

Browse source 
ansible.utils._git_repo_info() now supports branch names with slashes
This commit is contained in:
Abhijit Menon-Sen 2016-03-18 18:08:02 +05:30
commit a61a3e28da
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/cli/__init__.py
View file

@ -422,16 +422,20 @@ class CLI(object):
except (IOError, AttributeError): except (IOError, AttributeError):
return '' return ''
f = open(os.path.join(repo_path, "HEAD")) f = open(os.path.join(repo_path, "HEAD"))
branch = f.readline().split('/')[-1].rstrip("\n") line = f.readline().rstrip("\n")
if line.startswith("ref:"):
branch_path = os.path.join(repo_path, line[5:])
else:
branch_path = None
f.close() f.close()
branch_path = os.path.join(repo_path, "refs", "heads", branch) if branch_path and os.path.exists(branch_path):
if os.path.exists(branch_path): branch = '/'.join(line.split('/')[2:])
f = open(branch_path) f = open(branch_path)
commit = f.readline()[:10] commit = f.readline()[:10]
f.close() f.close()
else: else:
# detached HEAD # detached HEAD
commit = branch[:10] commit = line[:10]
branch = 'detached HEAD' branch = 'detached HEAD'
branch_path = os.path.join(repo_path, "HEAD") branch_path = os.path.join(repo_path, "HEAD")