summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorKarsten Blees <karsten.blees@gmail.com>2013-04-15 21:06:30 +0200
committerJunio C Hamano <gitster@pobox.com>2013-04-15 12:33:58 -0700
commit289ff5598fc4947fe0e6cfeb6db652e64894151c (patch)
tree39b4bd07d7a483fbe012d2a298e039fac489bfbc /dir.c
parent560bb7a7a146fddad3394dc913f1469d477d26a9 (diff)
downloadgit-289ff5598fc4947fe0e6cfeb6db652e64894151c.tar.gz
dir.c: git-status --ignored: don't list files in ignored directories
'git-status --ignored' lists both the ignored directory and the ignored files if the files are in a tracked sub directory. When recursing into sub directories in read_directory_recursive, pass on the check_only parameter so that we don't accidentally add the files. Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/dir.c b/dir.c
index dc3a50baf6..248cfea39f 100644
--- a/dir.c
+++ b/dir.c
@@ -1317,7 +1317,6 @@ static enum path_treatment treat_one_path(struct dir_struct *dir,
return path_ignored;
case DT_DIR:
strbuf_addch(path, '/');
-
switch (treat_directory(dir, path->buf, path->len, exclude, simplify)) {
case show_directory:
break;
@@ -1387,8 +1386,7 @@ static int read_directory_recursive(struct dir_struct *dir,
switch (treat_path(dir, de, &path, baselen, simplify)) {
case path_recurse:
contents += read_directory_recursive(dir, path.buf,
- path.len, 0,
- simplify);
+ path.len, check_only, simplify);
continue;
case path_ignored:
continue;