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

From

Johannes Sixt <j6t@kdbg.org>

Date

Nov 26, 2018, 19:49 UTC

Message-ID

<f06b734a-fc8e-221a-c983-f2ab9daba17f@kdbg.org>

In-Reply-To

<xmqqzhtwzghr.fsf@gitster-ct.c.googlers.com>

Am 26.11.18 um 04:04 schrieb Junio C Hamano:

> It appears to me that what Frank sees is not "^M highlighted for
> whitespace breakage appears only on postimage lines, while ^M is
> shown but not highlighted on preimage lines".  My reading of the
> above is "Not just without highlight, ^M is just *NOT* shown on the
> preimage line".
> 
> That does not sound right.  I would understand it if both lines
> showed ^M at the end, and only the one on the postimage line had it
> highlighted as a trailing-whitespace.

I agree that this is a (small?) weakness. But...

> When we are producing a colored output, we know we are *not* writing
> for machines, so one way to do it would be to turn CR at the end of
> the line into two letter "^" "M" sequence on our end, without relying
> on the terminal and/or the pager.  I dunno.

-- Hannes