From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Aug 2020 21:54:29 +0000 (-0700)
Subject: Merge branch 'en/dir-nonbare-embedded'
X-Git-Tag: v2.29.0-rc0~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11f433f79c790bcb5feae71b0320161d7ab7dea7;p=thirdparty%2Fgit.git

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
---

11f433f79c790bcb5feae71b0320161d7ab7dea7