From: Shawn Pearce <spearce@spearce.org>
Date: Fri, 24 Feb 2006 22:02:34 +0000 (-0500)
Subject: git ls files recursively show ignored files
X-Git-Tag: v1.3.0-rc1~145
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1e3584053d56157549c01114f9550d1db7014a3e;p=git.git

git ls files recursively show ignored files

Make git-ls-files --others --ignored recurse into non-excluded
subdirectories.

Typically when asking git-ls-files to display all files which are
ignored by one or more exclude patterns one would want it to recurse
into subdirectories which are not themselves excluded to see if
there are any excluded files contained within those subdirectories.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/ls-files.c b/ls-files.c
index 90b289f03..df25c8c01 100644
--- a/ls-files.c
+++ b/ls-files.c
@@ -279,8 +279,11 @@ static void read_directory(const char *path, const char *base, int baselen)
 				continue;
 			len = strlen(de->d_name);
 			memcpy(fullname + baselen, de->d_name, len+1);
-			if (excluded(fullname) != show_ignored)
-				continue;
+			if (excluded(fullname) != show_ignored) {
+				if (!show_ignored || DTYPE(de) != DT_DIR) {
+					continue;
+				}
+			}
 
 			switch (DTYPE(de)) {
 			struct stat st;