From fba92be8f73818c4e79dc0b93ba26733d0ba5efe Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Fri, 5 May 2017 12:53:27 -0700 Subject: dir: convert is_excluded_from_list to take an index Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano --- unpack-trees.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'unpack-trees.c') diff --git a/unpack-trees.c b/unpack-trees.c index aa15111fe..df9f975d0 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1068,7 +1068,7 @@ static int clear_ce_flags_dir(struct cache_entry **cache, int nr, struct cache_entry **cache_end; int dtype = DT_DIR; int ret = is_excluded_from_list(prefix->buf, prefix->len, - basename, &dtype, el); + basename, &dtype, el, &the_index); int rc; strbuf_addch(prefix, '/'); @@ -1171,7 +1171,7 @@ static int clear_ce_flags_1(struct cache_entry **cache, int nr, /* Non-directory */ dtype = ce_to_dtype(ce); ret = is_excluded_from_list(ce->name, ce_namelen(ce), - name, &dtype, el); + name, &dtype, el, &the_index); if (ret < 0) ret = defval; if (ret > 0) -- cgit v1.2.1