Fix #489
This commit is contained in:
parent
235d6d3652
commit
459370d71d
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue