Merge branch 'dt/untracked-subdir'
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2015 19:32:14 +0000 (12:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2015 19:32:15 +0000 (12:32 -0700)
The experimental untracked-cache feature were buggy when paths with
a few levels of subdirectories are involved.

* dt/untracked-subdir:
  untracked cache: fix entry invalidation
  untracked-cache: fix subdirectory handling

1  2 
dir.c

diff --cc dir.c
Simple merge