diff options
| author |  Matheus Tavares <matheus.bernardino@usp.br> | 2019-07-30 13:53:27 -0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-07-30 13:29:54 -0700 |
| commit | 6a289d45c0e5d155f536d7c1f73c3b33690e92c6 (patch) | |
| tree | 8df2d2154eb97939bd38f3d9a75b6643faa4b824 /Documentation/git-merge-file.txt | |
| parent | Merge fixes made on the 'master' front (diff) | |
| download | tgif-6a289d45c0e5d155f536d7c1f73c3b33690e92c6.tar.xz | |
grep: fix worktree case in submodules
Running git-grep with --recurse-submodules results in a cached grep for
the submodules even when --cached is not used. This makes all
modifications in submodules' tracked files be always ignored when
grepping. Solve that making git-grep respect the cached option when
invoking grep_cache() inside grep_submodule(). Also, add tests to
ensure that the desired behavior is performed.
Reported-by: Daniel Zaoui <jackdanielz@eyomi.org>
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions