diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-25 15:34:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-25 15:34:41 -0700 |
| commit | 071b489682f68c5e205ed3af2a7fe997f1d7c467 (patch) | |
| tree | d4c23836931ae859a95e1c62246a1618ae0338df /builtin-ls-files.c | |
| parent | 3319df6f3aa3271124847e2c91c7e6d0be961bc6 (diff) | |
| parent | caa7dac163f7f7fc827da6fd4a5aba259a50e1ab (diff) | |
Merge branch 'maint-1.6.4' into maint
* maint-1.6.4:
ls-files: excludes should not impact tracked files
Diffstat (limited to 'builtin-ls-files.c')
| -rw-r--r-- | builtin-ls-files.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/builtin-ls-files.c b/builtin-ls-files.c index 2c95ca6105..c5c0407b0b 100644 --- a/builtin-ls-files.c +++ b/builtin-ls-files.c @@ -170,10 +170,6 @@ 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 (excluded(dir, ce->name, &dtype) != - !!(dir->flags & DIR_SHOW_IGNORED)) - continue; if (show_unmerged && !ce_stage(ce)) continue; if (ce->ce_flags & CE_UPDATE) @@ -186,10 +182,6 @@ 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 (excluded(dir, ce->name, &dtype) != - !!(dir->flags & DIR_SHOW_IGNORED)) - continue; if (ce->ce_flags & CE_UPDATE) continue; err = lstat(ce->name, &st); |