From f0a126c029001ff16e6d8d9ebdcc6d14fd8e06a5 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 6 Aug 2017 01:07:03 +0200 Subject: [PATCH] fixup! Teach status to show ignored directories with all untracked files It is totally my fault that I failed to notice the updated PR at https://github.com/git-for-windows/git/pull/1243. This backports the fixes into the next Git for Windows version's commit graph. Signed-off-by: Johannes Schindelin --- Documentation/technical/api-directory-listing.txt | 1 - dir.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/technical/api-directory-listing.txt b/Documentation/technical/api-directory-listing.txt index 1db7d2632374cd..b2836c9c5b4417 100644 --- a/Documentation/technical/api-directory-listing.txt +++ b/Documentation/technical/api-directory-listing.txt @@ -35,7 +35,6 @@ The notable options are: `DIR_SHOW_IGNORED_DIRECTORY`::: - (EXPERIMENTAL) If this is set, non-empty directories that match an ignore pattern are returned. The individual files contained in ignored directories are not included. diff --git a/dir.c b/dir.c index 5730c17c80e54b..26e286db34772d 100644 --- a/dir.c +++ b/dir.c @@ -1417,9 +1417,9 @@ static enum path_treatment treat_directory(struct dir_struct *dir, return exclude ? path_excluded : path_untracked; untracked = lookup_untracked(dir->untracked, untracked, - dirname + baselen, len - baselen); + dirname + baselen, len - baselen); return read_directory_recursive(dir, istate, dirname, len, - untracked, 1, 0, pathspec); + untracked, 1, 0, pathspec); }