X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-ls-files.c;h=c9a03e5427bbf1390aeefb9d48b4e362ca6a8e1b;hb=b30ccd757354ea09b41e4359b0a5ab429d12f02e;hp=c5c0407b0b824327b0bbc6ae50ae1a030761b2b9;hpb=814035c12a07927ea03350184a14f869cdce7276;p=git.git diff --git a/builtin-ls-files.c b/builtin-ls-files.c index c5c0407b0..c9a03e542 100644 --- a/builtin-ls-files.c +++ b/builtin-ls-files.c @@ -170,6 +170,10 @@ static void show_files(struct dir_struct *dir, const char *prefix) if (show_cached | show_stage) { for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; + int dtype = ce_to_dtype(ce); + if (dir->flags & DIR_SHOW_IGNORED && + !excluded(dir, ce->name, &dtype)) + continue; if (show_unmerged && !ce_stage(ce)) continue; if (ce->ce_flags & CE_UPDATE) @@ -182,6 +186,10 @@ static void show_files(struct dir_struct *dir, const char *prefix) struct cache_entry *ce = active_cache[i]; struct stat st; int err; + int dtype = ce_to_dtype(ce); + if (dir->flags & DIR_SHOW_IGNORED && + !excluded(dir, ce->name, &dtype)) + continue; if (ce->ce_flags & CE_UPDATE) continue; err = lstat(ce->name, &st);