Merge branch 'bw/pathspec-match-submodule-boundary'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Dec 2017 19:33:56 +0000 (11:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Dec 2017 19:33:56 +0000 (11:33 -0800)
An v2.12-era regression in pathspec match logic, which made it look
into submodule tree even when it is not desired, has been fixed.

* bw/pathspec-match-submodule-boundary:
  pathspec: only match across submodule boundaries when requested

1  2 
builtin/grep.c
pathspec.h
tree-walk.c

diff --cc builtin/grep.c
Simple merge
diff --cc pathspec.h
Simple merge
diff --cc tree-walk.c
Simple merge