summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-05-05 12:53:33 -0700
committerJunio C Hamano <gitster@pobox.com>2017-05-06 19:15:39 +0900
commit2c1eb104543265c2d26cf36303b35e426dcacf68 (patch)
tree8978037ff920390a1c460336201ce383560f68b4 /unpack-trees.c
parent0ef8e169aa40ac98dce71f61074bcd729cd9ba54 (diff)
downloadgit-2c1eb104543265c2d26cf36303b35e426dcacf68.tar.gz
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>
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index d5b401450f..cff6b3f8c4 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);