On Wed, May 19, 2021 at 8:27 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > [Graduated to 'master'] ... > * en/dir-traversal (2021-05-13) 9 commits > (merged to 'next' on 2021-05-14 at 316f9264c1) > + 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 > > "git clean" and "git ls-files -i" had confusion around working on > or showing ignored paths inside an ignored directory, which has > been corrected. Did you change your mind since https://lore.kernel.org/git/xmqqtumzzedd.fsf@gitster.g/, or did you just accidentally merge all 9 patches instead of only the first 7? Sorry about this, I was going to resend corrected versions of the last two patches...but I'm guessing that's just not warranted anymore?
