Merge branch 'js/submodule-in-excluded' into maint
commit21deee3cabce7d58c50992f57a224e52187a1d26
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:04:54 +0000 (15 12:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:04:54 +0000 (15 12:04 +0900)
tree02919a42ce50eb8c43d22264fc2cb141a2101a7c
parenta9749b0b785c2ccf245835d9a8426fa28c62005e
parentfadb4820c4a0178ce76c24d7b48b7ea70210727a
Merge branch 'js/submodule-in-excluded' into maint

"git status --ignored -u" did not stop at a working tree of a
separate project that is embedded in an ignored directory and
listed files in that other project, instead of just showing the
directory itself as ignored.

* js/submodule-in-excluded:
  status: do not get confused by submodules in excluded directories
dir.c