diff options
author | Antoine Pelisse <apelisse@gmail.com> | 2012-12-30 15:39:01 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-01 16:24:48 -0800 |
commit | eb8c5b872ef144add4ac89f85bcddc974ac7114d (patch) | |
tree | 159c3b35887ebd32cb865eb251307226a528baff /resolve-undo.c | |
parent | dir.c: Make git-status --ignored more consistent (diff) | |
download | tgif-eb8c5b872ef144add4ac89f85bcddc974ac7114d.tar.xz |
git-status: Test --ignored behavior
Test all possible use-cases of git-status "--ignored" with the
"--untracked-files" option with values "normal" and "all":
- An untracked directory is listed as untracked if it has a mix of
untracked and ignored files in it. With -uall, ignored/untracked
files are listed as ignored/untracked.
- An untracked directory with only ignored files is listed as
ignored. With -uall, all files in the directory are listed.
- An ignored directory is listed as ignored. With -uall, all files
in the directory are listed as ignored.
- An ignored and committed directory is listed as ignored if it has
untracked files. With -uall, all untracked files in the
directory are listed as ignored.
Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions