Merge branch 'jk/name-hash-dirent'

* jk/name-hash-dirent: fix phantom untracked files when core.ignorecase is set
2011-10-17 21:37:11 -07:00
parent d2843da029 2548183bad
commit 6f55f02815
2 changed files with 9 additions and 7 deletions
--- a/cache.h
+++ b/cache.h
@ -168,6 +168,7 @@ struct cache_entry {
 	unsigned int ce_flags;
 	unsigned char sha1[20];
 	struct cache_entry *next;
+	struct cache_entry *dir_next;
 	char name[FLEX_ARRAY]; /* more */
 };