lavatech/rana-cli
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

prevent tracking git branch with detached head

Browse source
This commit is contained in:
Alan Hamlett 2016-06-01 10:08:00 +02:00
parent f4f242d698
commit aaf49a5c22
5 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
wakatime/projects/git.py
View file

@ -38,11 +38,11 @@ class Git(BaseProject):
head = os.path.join(self._project_base(), '.git', 'HEAD')
try:
with open(head, 'r', encoding='utf-8') as fh:
return u(fh.readline().strip().rsplit('/', 1)[-1])
return self._get_branch_from_head_file(fh.readline())
except UnicodeDecodeError: # pragma: nocover
try:
with open(head, 'r', encoding=sys.getfilesystemencoding()) as fh:
return u(fh.readline().strip().rsplit('/', 1)[-1])
return self._get_branch_from_head_file(fh.readline())
except:
log.traceback('warn')
except IOError: # pragma: nocover
@ -64,3 +64,8 @@ class Git(BaseProject):
if split_path[1] == '':
return None
return self._find_git_config_file(split_path[0])
def _get_branch_from_head_file(self, line):
if u(line.strip()).startswith('ref: '):
return u(line.strip().rsplit('/', 1)[-1])
return None