t7061: status --ignored should search untracked dirs
Pereb8c5b87
, `status --ignored` by design does not list ignored files if they are in a directory which contains only ignored and untracked files (which is itself considered to be untracked) without `-uall`. This does not make sense for `--ignored`, which claims to "Show ignored files as well." Thus we revisiteb8c5b87
and decide that for such directories, `status --ignored` will list the directory as untracked *and* list all ignored files within said directory even without `-uall`. Signed-off-by: Samuel Lijin <sxlijin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b3487ccc0b
commit
0a81d4a559
@ -9,9 +9,10 @@ cat >expected <<\EOF
|
||||
?? actual
|
||||
?? expected
|
||||
?? untracked/
|
||||
!! untracked/ignored
|
||||
EOF
|
||||
|
||||
test_expect_success 'status untracked directory with --ignored' '
|
||||
test_expect_failure 'status untracked directory with --ignored' '
|
||||
echo "ignored" >.gitignore &&
|
||||
mkdir untracked &&
|
||||
: >untracked/ignored &&
|
||||
@ -20,7 +21,7 @@ test_expect_success 'status untracked directory with --ignored' '
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'same with gitignore starting with BOM' '
|
||||
test_expect_failure 'same with gitignore starting with BOM' '
|
||||
printf "\357\273\277ignored\n" >.gitignore &&
|
||||
mkdir -p untracked &&
|
||||
: >untracked/ignored &&
|
||||
|
Loading…
Reference in New Issue
Block a user