undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dir.c: git-status --ignored: don't list files in ignored directories

Browse Source 
'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>
This commit is contained in:
Karsten Blees 2013-04-15 21:06:30 +02:00 committed by Junio C Hamano
parent 560bb7a7a1
commit 289ff5598f
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dir.c
View File

@ -1317,7 +1317,6 @@ static enum path_treatment treat_one_path(struct dir_struct *dir,
return path_ignored; return path_ignored;
case DT_DIR: case DT_DIR:
strbuf_addch(path, '/'); strbuf_addch(path, '/');
switch (treat_directory(dir, path->buf, path->len, exclude, simplify)) { switch (treat_directory(dir, path->buf, path->len, exclude, simplify)) {
case show_directory: case show_directory:
break; break;
@ -1387,8 +1386,7 @@ static int read_directory_recursive(struct dir_struct *dir,
switch (treat_path(dir, de, &path, baselen, simplify)) { switch (treat_path(dir, de, &path, baselen, simplify)) {
case path_recurse: case path_recurse:
contents += read_directory_recursive(dir, path.buf, contents += read_directory_recursive(dir, path.buf,
path.len, 0, path.len, check_only, simplify);
simplify);
continue; continue;
case path_ignored: case path_ignored:
continue; continue;

27
t/t7061-wtstatus-ignore.sh
View File

@ -170,4 +170,31 @@ test_expect_success 'status ignored tracked directory with uncommitted file in u
test_cmp expected actual 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 test_done