Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 3, 2018, 01:15 UTC
- Message-ID
- <xmqqmupnh0lo.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <7a4ecc75-2dc4-041b-3d12-46cddae0a27f@googlemail.com>
Frank Schäfer <fschaefer.oss@googlemail.com> writes:
Show 15 quoted lines
> Hi Junio, > > Am 29.11.18 um 03:11 schrieb Junio C Hamano: > [...] >> 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.
OK, yeah, I think I meant "after", i.e. ... CR <RESET> LF, in order to force CR to be separated from LF.
> Now what about the case eol=crlf ?
I have no strong opinions, other than that "LF in repository, CRLF in working tree" would make the issue go away (when it is solved for EOL=LF like the above, that is).
> Keeping the current behavior of '-' lines is correct. > But shouldn't ^M now be suppressed in '+' lines for a consistent behavior ?
If "LF in repository, CRLF in working tree" is done, there would not be ^M at the end of the line, not just for removed lines, but also for added lines, no?