diff options
| author |  Antoine Pelisse <apelisse@gmail.com> | 2012-12-30 15:39:00 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-01-01 16:24:45 -0800 |
| commit | 721ac4edde75723ef8dbbb68989bda89fbf6fc66 (patch) | |
| tree | 55040c81db149276a3de41db6df15a66ca5f56c5 /git-rebase.sh | |
| parent | Git 1.7.12.4 (diff) | |
| download | tgif-721ac4edde75723ef8dbbb68989bda89fbf6fc66.tar.xz | |
dir.c: Make git-status --ignored more consistent
The current behavior of git-status is inconsistent and misleading.
Especially when used with --untracked-files=all option:
- files ignored in untracked directories will be missing from
status output.
- untracked files in committed yet ignored directories are also
missing.
- with --untracked-files=normal, untracked directories that
contains only ignored files are dropped too.
Make the behavior more consistent across all possible use cases:
- "--ignored --untracked-files=normal" doesn't show each specific
files but top directory. It instead shows untracked directories
that only contains ignored files, and ignored tracked directories
with untracked files.
- "--ignored --untracked-files=all" shows all ignored files, either
because it's in an ignored directory (tracked or untracked), or
because the file is explicitly ignored.
Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
0 files changed, 0 insertions, 0 deletions