Merge branch 'jk/ls-files-recurse-submodules-fix'
commit2d646e3e1fd0ae7f525034abee73d06ac8946729
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Apr 2017 05:07:57 +0000 (23 22:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Apr 2017 05:07:57 +0000 (23 22:07 -0700)
treef3be44131af79184a4c5647c9b41ddd915d86a8f
parentf9096db54b29ed17afc6e3393f159ea55142b14c
parent2cfe66a8ee57fb3da18c262db8e6df95e263510b
Merge branch 'jk/ls-files-recurse-submodules-fix'

"ls-files --recurse-submodules" did not quite work well in a
project with nested submodules.

* jk/ls-files-recurse-submodules-fix:
  ls-files: fix path used when recursing into submodules
  ls-files: fix recurse-submodules with nested submodules