Re: Bug: Problem with CRLF line ending in git-diff with coloring

2014-02-14 Thread Stefan-W. Hahn
Mail von Stefan-W. Hahn, Sun, 09 Feb 2014 at 12:01:55 +0100: Good afternoon, I updated the test a little bit. Test 3 and 7 are going wrong. Both tests have a CRLF line ending in the changed line. I you redirect the output of the test to a file you see the main problem: , |

Re: Bug: Problem with CRLF line ending in git-diff with coloring

2014-02-14 Thread Stefan-W. Hahn
Mail von Stefan-W. Hahn, Sun, 09 Feb 2014 at 12:01:55 +0100: Good afternoon, I updated the test a little bit. Test 3 and 7 are going wrong. Both tests have a CRLF line ending in the changed line. I you redirect the output of the test to a file you see the main problem: , |

Re: Bug: Problem with CRLF line ending in git-diff with coloring

2014-02-14 Thread Johannes Sixt
Am 14.02.2014 17:47, schrieb Stefan-W. Hahn: It's the right solution. IOW, you should place something like this in your .gitattributes: *.html whitespace=cr-at-eol Sorry, but this is not possible, because I have files of both sorts (mainly C/C++) files in my repository and cannot change

Re: Bug: Problem with CRLF line ending in git-diff with coloring

2014-02-14 Thread Stefan-W. Hahn
Mail von Johannes Sixt, Fri, 14 Feb 2014 at 22:19:03 +0100: Good morning, Am 14.02.2014 17:47, schrieb Stefan-W. Hahn: It's the right solution. IOW, you should place something like this in your .gitattributes: *.html whitespace=cr-at-eol Sorry, but this is not possible, because I

Re: Bug: Problem with CRLF line ending in git-diff with coloring

2014-02-09 Thread Johannes Sixt
Am 09.02.2014 12:01, schrieb Stefan-W. Hahn: Good morning, when diffing output where files have CRLF line ending, the coloring seems wrong, because in changed lines the CR (^M) is highlighted, even if the line ending has not changed. ... If WS_CR_AT_EOL is set in ecbdata-ws_rule, it works