Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF

From: Frank Schäfer <fschaefer.oss@googlemail.com>
Date: Dec 2, 2018, 19:31 UTC
Message-ID: <7a4ecc75-2dc4-041b-3d12-46cddae0a27f@googlemail.com>
In-Reply-To: <xmqqk1kwr5tp.fsf@gitster-ct.c.googlers.com>

Hi Junio,

Am 29.11.18 um 03:11 schrieb Junio C Hamano: [...]

Show 6 quoted lines

> This was misspoken a bit.  Let's revise it to
>
>  	When producing a colored output (not limited to whitespace
>  	error coloring of diff output) for contents that are not
>  	marked as eol=crlf (and other historical means), insert
>  	<RESET> before a CR that comes immediately before a LF.

You mean
     ...
     <RESET> *after* a CR that comes immediately before a LF."

OK, AFAICS this produces the desired output in all cases if eol=lf.

Now what about the case eol=crlf ? Keeping the current behavior of '-' lines is correct. But shouldn't ^M now be suppressed in '+' lines for a consistent behavior ?

With other words: "If CR comes immediately before a LF, do the following with *all* lines: <RESET> after the CR if eol=lf but do not <RESET> after the CR if eol=crlf."

Regards, Frank