From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 May 2021 23:54:58 +0000 (+0900)
Subject: Merge branch 'en/dir-traversal'
X-Git-Tag: v2.32.0-rc1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33be431c0c7284c1adf0fe49f7838dbc8aee6ea9;p=thirdparty%2Fgit.git

Merge branch 'en/dir-traversal'

"git clean" and "git ls-files -i" had confusion around working on
or showing ignored paths inside an ignored directory, which has
been corrected.

* en/dir-traversal:
  dir: introduce readdir_skip_dot_and_dotdot() helper
  dir: update stale description of treat_directory()
  dir: traverse into untracked directories if they may have ignored subfiles
  dir: avoid unnecessary traversal into ignored directory
  t3001, t7300: add testcase showcasing missed directory traversal
  t7300: add testcase showing unnecessary traversal into ignored directory
  ls-files: error out on -i unless -o or -c are specified
  dir: report number of visited directories and paths with trace2
  dir: convert trace calls to trace2 equivalents
---

33be431c0c7284c1adf0fe49f7838dbc8aee6ea9