Merge branch 'en/dir-nonbare-embedded'
commit11f433f79c790bcb5feae71b0320161d7ab7dea7
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Aug 2020 21:54:29 +0000 (24 14:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Aug 2020 21:54:29 +0000 (24 14:54 -0700)
tree3e45944daa791896d03ab00afa52a0275c10273a
parent9e8c7542cb1307b0a23c8bdc2a8e039ab6f11b17
parentab282aa548b807c022d521e83d843e4585b89dbb
Merge branch 'en/dir-nonbare-embedded'

"ls-files -o" mishandled the top-level directory of another git
working tree that hangs in the current git working tree.

* en/dir-nonbare-embedded:
  dir: avoid prematurely marking nonbare repositories as matches
  t3000: fix some test description typos
dir.c