commit 2c1eb104543265c2d26cf36303b35e426dcacf68
author Brandon Williams <bmwill@google.com> Fri May 05 12:53:33 2017 -0700
committer Junio C Hamano <gitster@pobox.com> Sat May 06 19:15:39 2017 +0900
tree 8978037ff920390a1c460336201ce383560f68b4
parent 0ef8e169aa40ac98dce71f61074bcd729cd9ba54

dir: convert read_directory to take an index

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index d5b4014..cff6b3f 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1592,7 +1592,7 @@ static int verify_clean_subdirectory(const struct cache_entry *ce,
 	memset(&d, 0, sizeof(d));
 	if (o->dir)
 		d.exclude_per_dir = o->dir->exclude_per_dir;
-	i = read_directory(&d, pathbuf, namelen+1, NULL);
+	i = read_directory(&d, &the_index, pathbuf, namelen+1, NULL);
 	if (i)
 		return o->gently ? -1 :
 			add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);