ls-files: convert ce_excluded to take an index

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

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 375fe09d1e7a9c58c9c99b25689fcf7607decf49..762257f3997ef91f77623bc4e1bd0fb8164d2756 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -321,10 +321,11 @@ static void show_ru_info(const struct index_state *istate)
        }
 }
 
        }
 }
 

-static int ce_excluded(struct dir_struct *dir, const struct cache_entry *ce)
+static int ce_excluded(struct dir_struct *dir, struct index_state *istate,
+                      const struct cache_entry *ce)

 {
        int dtype = ce_to_dtype(ce);
 {
        int dtype = ce_to_dtype(ce);

-       return is_excluded(dir, &the_index, ce->name, &dtype);
+       return is_excluded(dir, istate, ce->name, &dtype);

 }
 
 static void show_files(struct dir_struct *dir)
 }
 
 static void show_files(struct dir_struct *dir)


@@ -345,7 +346,7 @@ static void show_files(struct dir_struct *dir)
                for (i = 0; i < active_nr; i++) {
                        const struct cache_entry *ce = active_cache[i];
                        if ((dir->flags & DIR_SHOW_IGNORED) &&
                for (i = 0; i < active_nr; i++) {
                        const struct cache_entry *ce = active_cache[i];
                        if ((dir->flags & DIR_SHOW_IGNORED) &&

-                           !ce_excluded(dir, ce))
+                           !ce_excluded(dir, &the_index, ce))

                                continue;
                        if (show_unmerged && !ce_stage(ce))
                                continue;
                                continue;
                        if (show_unmerged && !ce_stage(ce))
                                continue;


@@ -361,7 +362,7 @@ static void show_files(struct dir_struct *dir)
                        struct stat st;
                        int err;
                        if ((dir->flags & DIR_SHOW_IGNORED) &&
                        struct stat st;
                        int err;
                        if ((dir->flags & DIR_SHOW_IGNORED) &&

-                           !ce_excluded(dir, ce))
+                           !ce_excluded(dir, &the_index, ce))

                                continue;
                        if (ce->ce_flags & CE_UPDATE)
                                continue;
                                continue;
                        if (ce->ce_flags & CE_UPDATE)
                                continue;