diff options
| author | Brandon Williams <bmwill@google.com> | 2017-05-05 12:53:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-06 19:15:39 +0900 |
| commit | fba92be8f73818c4e79dc0b93ba26733d0ba5efe (patch) | |
| tree | 86f5febe259661dbc0e6cb3ca72a101e7e403f23 /unpack-trees.c | |
| parent | 2b70e88d367f3e697023c2b7c3054e8a26e6faaa (diff) | |
| download | git-fba92be8f73818c4e79dc0b93ba26733d0ba5efe.tar.gz | |
dir: convert is_excluded_from_list 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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index aa15111fef..df9f975d01 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) |