]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2d498a7 45bde58)
Merge branch 'mt/grep-submodule-textconv'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Oct 2021 22:15:56 +0000 (15:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Oct 2021 22:15:56 +0000 (15:15 -0700)
commit1fdfb774aaaa0ee8acb0a1ec9b601e5a2d2999f1
tree95a0b294812d7081823f08cb08b73941f78c4a89tree | snapshot
parent2d498a7c894444fba5cfb0007e6b757afcde63c6commit | diff
parent45bde58ef8f521e7deb730ffe90040b58d11af64commit | 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
grep.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.