diff options
| author | Karsten Blees <karsten.blees@gmail.com> | 2013-04-15 21:10:05 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-15 12:34:00 -0700 |
| commit | 5bd8e2d894be3a27e9b32b062ff224cc2396b69c (patch) | |
| tree | 6fef740698678a93db1205804b825bf48cbf935e /t/t7061-wtstatus-ignore.sh | |
| parent | be8a84c526691667fc04a8241d93a3de1de298ab (diff) | |
| download | git-5bd8e2d894be3a27e9b32b062ff224cc2396b69c.tar.gz | |
dir.c: git-clean -d -X: don't delete tracked directories
The notion of "ignored tracked" directories introduced in 721ac4ed "dir.c:
Make git-status --ignored more consistent" has a few unwanted side effects:
- git-clean -d -X: deletes ignored tracked directories. git-clean should
never delete tracked content.
- git-ls-files --ignored --other --directory: lists ignored tracked
directories instead of "other" directories.
- git-status --ignored: lists ignored tracked directories while contained
files may be listed as modified. Paths listed by git-status should be
disjoint (except in long format where a path may be listed in both the
staged and unstaged section).
Additionally, the current behaviour violates documentation in gitignore(5)
("Specifies intentionally *untracked* files to ignore") and Documentation/
technical/api-directory-listing.txt ("DIR_SHOW_OTHER_DIRECTORIES: Include
a directory that is *not tracked*.").
In dir.c::treat_directory, remove the special handling of ignored tracked
directories, so that the DIR_SHOW_OTHER_DIRECTORIES flag only affects
"other" (i.e. untracked) directories. In dir.c::dir_add_name, check that
added paths are untracked even if DIR_SHOW_IGNORED is set.
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7061-wtstatus-ignore.sh')
| -rwxr-xr-x | t/t7061-wtstatus-ignore.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh index 4c6f145d97..460789b4d8 100755 --- a/t/t7061-wtstatus-ignore.sh +++ b/t/t7061-wtstatus-ignore.sh @@ -186,7 +186,7 @@ cat >expected <<\EOF ?? .gitignore ?? actual ?? expected -!! tracked/ +!! tracked/uncommitted EOF test_expect_success 'status ignored tracked directory and uncommitted file with --ignore' ' @@ -212,7 +212,7 @@ cat >expected <<\EOF ?? .gitignore ?? actual ?? expected -!! tracked/ +!! tracked/ignored/ EOF test_expect_success 'status ignored tracked directory with uncommitted file in untracked subdir with --ignore' ' @@ -239,7 +239,7 @@ cat >expected <<\EOF ?? .gitignore ?? actual ?? expected -!! tracked/ +!! tracked/ignored/uncommitted EOF test_expect_success 'status ignored tracked directory with uncommitted file in tracked subdir with --ignore' ' |