Commit 289ff559 authored by Karsten Blees's avatar Karsten Blees Committed by Junio C Hamano

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: default avatarKarsten Blees <blees@dcon.de>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 560bb7a7
......@@ -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;
......
......@@ -170,4 +170,31 @@ test_expect_success 'status ignored tracked directory with uncommitted file in u
test_cmp expected actual
'
cat >expected <<\EOF
?? .gitignore
?? actual
?? expected
!! tracked/
EOF
test_expect_success 'status ignored tracked directory with uncommitted file in tracked subdir with --ignore' '
: >tracked/ignored/committed &&
git add -f tracked/ignored/committed &&
git commit -m. &&
git status --porcelain --ignored >actual &&
test_cmp expected actual
'
cat >expected <<\EOF
?? .gitignore
?? actual
?? expected
!! tracked/ignored/uncommitted
EOF
test_expect_success 'status ignored tracked directory with uncommitted file in tracked subdir with --ignore -u' '
git status --porcelain --ignored -u >actual &&
test_cmp expected actual
'
test_done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment