From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Jun 2017 20:27:01 +0000 (-0700)
Subject: Merge branch 'sl/clean-d-ignored-fix' into maint
X-Git-Tag: v2.13.2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4683b4e9cad5e0077fe0a067b15f69c828581bb;p=git

Merge branch 'sl/clean-d-ignored-fix' into maint

"git clean -d" used to clean directories that has ignored files,
even though the command should not lose ignored ones without "-x".
"git status --ignored"  did not list ignored and untracked files
without "-uall".  These have been corrected.

* sl/clean-d-ignored-fix:
  clean: teach clean -d to preserve ignored paths
  dir: expose cmp_name() and check_contains()
  dir: hide untracked contents of untracked dirs
  dir: recurse into untracked dirs for ignored files
  t7061: status --ignored should search untracked dirs
  t7300: clean -d should skip dirs with ignored files
---

f4683b4e9cad5e0077fe0a067b15f69c828581bb