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

Fix #489

This commit is contained in:
Kovid Goyal 2013-05-14 14:42:51 +05:30 committed by Kim Silkebækken
parent 235d6d3652
commit 459370d71d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ class FileStatusCache(dict):
parent = nparent parent = nparent
ignore_files.add(os.path.join(parent, ignore_file_name)) ignore_files.add(os.path.join(parent, ignore_file_name))
for f in extra_ignore_files: for f in extra_ignore_files:
ignore_files.add(os.path.join(directory, *f.split('/'))) ignore_files.add(f)
self.keypath_ignore_map[keypath] = ignore_files self.keypath_ignore_map[keypath] = ignore_files
for ignf in ignore_files: for ignf in ignore_files:
self.ignore_map[ignf].add(keypath) self.ignore_map[ignf].add(keypath)

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=('.git/info/exclude',)) path, '.gitignore', func, extra_ignore_files=(os.path.join(gitd, '.git/info/exclude'),))
return func(directory, path) return func(directory, path)