diff --git a/powerline/lib/vcs/__init__.py b/powerline/lib/vcs/__init__.py index a322e6bf..e5e07f8d 100644 --- a/powerline/lib/vcs/__init__.py +++ b/powerline/lib/vcs/__init__.py @@ -82,7 +82,7 @@ class FileStatusCache(dict): parent = nparent ignore_files.add(os.path.join(parent, ignore_file_name)) 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 for ignf in ignore_files: self.ignore_map[ignf].add(keypath) diff --git a/powerline/lib/vcs/git.py b/powerline/lib/vcs/git.py index db4e59d3..db4cdc77 100644 --- a/powerline/lib/vcs/git.py +++ b/powerline/lib/vcs/git.py @@ -37,7 +37,7 @@ def do_status(directory, path, func): 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=('.git/info/exclude',)) + path, '.gitignore', func, extra_ignore_files=(os.path.join(gitd, '.git/info/exclude'),)) return func(directory, path)