]> dgit.raspbian.org Git - git-annex.git/commit
Pass --no-textconv when running git diff internally
authorJoey Hess <joeyh@joeyh.name>
Tue, 1 Feb 2022 17:43:18 +0000 (13:43 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 1 Feb 2022 17:43:18 +0000 (13:43 -0400)
commit46d5098ff450b8e83b7db9671cd830b2d668402c
tree43dba29aecd238574ff1858b326aeca1499259e5
parent283c53642f17339b21966b2115b64abc9b873605
Pass --no-textconv when running git diff internally

Seems that --no-ext-diff and -c diff.external= are not enough to disable
external diff command when gitattributes textconv specifies it.

I'm pretty sure that --no-ext-diff and -c diff.external= are not both
needed, but not 100%. Something about -G may need the latter to fully
disable diffs in some cases. So kept that part as it was.

Sponsored-by: Dartmouth College's Datalad project
CHANGELOG
Database/Keys.hs
doc/bugs/init__58___syntax_warnings_in_diff_driver_on_Windows.mdwn
doc/bugs/init__58___syntax_warnings_in_diff_driver_on_Windows/comment_1_65fda26959f82d1f3d110e72d7aaec9a._comment [new file with mode: 0644]