Merge branch 'jc/gitignore-ends-with-slash'

* jc/gitignore-ends-with-slash:
  gitignore: lazily find dtype
  gitignore(5): Allow "foo/" in ignore list to match directory "foo"

diff --cc builtin-ls-files.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc dir.c
Simple merge

diff --cc unpack-trees.c
Simple merge