tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'kovidgoyal/fix-482' into develop

This commit is contained in:
Kim Silkebækken 2013-06-02 15:43:26 +02:00
parent 669327df0d 0435d44984
commit 540b076aa0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
powerline/lib/vcs/git.py
View File

@ -36,8 +36,12 @@ def do_status(directory, path, func):
with open(gitd, 'rb') as f:
raw = f.read().partition(b':')[2].strip()
gitd = os.path.abspath(os.path.join(directory, raw))
return get_file_status(directory, os.path.join(gitd, 'index'),
path, '.gitignore', func, extra_ignore_files=(os.path.join(gitd, 'info/exclude'),))
# We need HEAD as without it using fugitive to commit causes the
# current file's status (and only the current file) to not be updated
# for some reason I cannot be bothered to figure out.
return get_file_status(
directory, os.path.join(gitd, 'index'),
path, '.gitignore', func, extra_ignore_files=tuple(os.path.join(gitd, x) for x in ('HEAD', 'info/exclude')))
return func(directory, path)