• Karsten Blees's avatar
    dir.c: git-clean -d -X: don't delete tracked directories · 5bd8e2d8
    Karsten Blees authored
    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: default avatarKarsten Blees <blees@dcon.de>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
t7061-wtstatus-ignore.sh 5.53 KB