diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-10-14 01:15:56 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-10-14 01:15:56 +0300 |
commit | 1fdfb774aaaa0ee8acb0a1ec9b601e5a2d2999f1 (patch) | |
tree | 95a0b294812d7081823f08cb08b73941f78c4a89 /grep.h | |
parent | 2d498a7c894444fba5cfb0007e6b757afcde63c6 (diff) | |
parent | 45bde58ef8f521e7deb730ffe90040b58d11af64 (diff) |
Merge branch 'mt/grep-submodule-textconv'
"git grep --recurse-submodules" takes trees and blobs from the
submodule repository, but the textconv settings when processing a
blob from the submodule is not taken from the submodule repository.
A test is added to demonstrate the issue, without fixing it.
* mt/grep-submodule-textconv:
grep: demonstrate bug with textconv attributes and submodules
Diffstat (limited to 'grep.h')
-rw-r--r-- | grep.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -128,9 +128,9 @@ struct grep_opt { * instead. * * This is potentially the cause of at least one bug - "git grep" - * ignoring the textconv attributes from submodules. See [1] for more - * information. - * [1] https://lore.kernel.org/git/CAHd-oW5iEQarYVxEXoTG-ua2zdoybTrSjCBKtO0YT292fm0NQQ@mail.gmail.com/ + * using the textconv attributes from the superproject on the + * submodules. See the failing "git grep --textconv" tests in + * t7814-grep-recurse-submodules.sh for more information. */ struct repository *repo; |