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

Merge branch 'fix-git-errors' into develop

This commit is contained in:
Kim Silkebækken 2013-05-21 10:08:46 +02:00
parent e3ed3aba6c bb4bc52c8a
commit 516642c7f4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ def do_status(directory, path, func):
raw = f.read().partition(b':')[2].strip() raw = f.read().partition(b':')[2].strip()
gitd = os.path.abspath(os.path.join(directory, raw)) gitd = os.path.abspath(os.path.join(directory, raw))
return get_file_status(directory, os.path.join(gitd, 'index'), return get_file_status(directory, os.path.join(gitd, 'index'),
path, '.gitignore', func, extra_ignore_files=(os.path.join(gitd, '.git/info/exclude'),)) path, '.gitignore', func, extra_ignore_files=(os.path.join(gitd, 'info/exclude'),))
return func(directory, path) return func(directory, path)