]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e8c754 ab282aa)
Merge branch 'en/dir-nonbare-embedded'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Aug 2020 21:54:29 +0000 (14:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Aug 2020 21:54:29 +0000 (14:54 -0700)
"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

1  2 
dir.c patch | diff1 | diff2 | blob | history

diff --cc dir.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.