[PATCH v2] status: always report ignored tracked directories
- From
Antoine Pelisse <apelisse@gmail.com>
- Date
- Jan 6, 2013, 22:09 UTC
- Message-ID
- <1357510179-22852-1-git-send-email-apelisse@gmail.com>
- In-Reply-To
- <20130105230303.GA5195@sigill.intra.peff.net>
Tracked directories (i.e. directories containing tracked files) that are ignored must be reported as ignored if they contain untracked files.
Currently, files in the index can't be reported as ignored and are automatically dropped from the list:
- When core.ignorecase is false, directories (which are not directly tracked) are not listed as part of the index, and the directory can be shown as ignored.
- When core.ignorecase is true on the other hand, directories are reported as part of the index, and the directory is dropped, thus not displayed as ignored.
Fix that behavior by allowing indexed file to be added when looking for ignored files.
- Ignored tracked and untracked directories are treated the same way when looking for ignored files, so we should not care about their index status. - Files are dismissed by treat_file() if they belong to the index, so that step would have been a no-op anyway.
Signed-off-by: Antoine Pelisse <apelisse@gmail.com> --- dir.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/dir.c b/dir.c index 9b80348..f836590 100644 --- a/dir.c +++ b/dir.c @@ -672,7 +672,8 @@ static struct dir_entry *dir_entry_new(const char *pathname, int len) static struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len) { - if (cache_name_exists(pathname, len, ignore_case)) + if (!(dir->flags & DIR_SHOW_IGNORED) && + cache_name_exists(pathname, len, ignore_case)) return NULL; ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc); @@ -877,11 +878,7 @@ static int treat_file(struct dir_struct *dir, struct strbuf *path, int exclude, if (exclude) exclude_file = !(dir->flags & DIR_SHOW_IGNORED); else if (dir->flags & DIR_SHOW_IGNORED) { - /* - * Optimization: - * Don't spend time on indexed files, they won't be - * added to the list anyway - */ + /* Always exclude indexed files */ struct cache_entry *ce = index_name_exists(&the_index, path->buf, path->len, ignore_case); -- 1.7.12.4.3.g90f5e2d