From: Johannes Sixt <j6t@kdbg.org>
To: "Frank Schäfer" <fschaefer.oss@googlemail.com>
Cc: git@vger.kernel.org
Subject: Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF
Date: Sat, 24 Nov 2018 23:07:26 +0100 [thread overview]
Message-ID: <80ffe850-b966-a37b-09bd-44e04d769944@kdbg.org> (raw)
In-Reply-To: <edadf857-2d4b-f058-5e07-286afb312901@googlemail.com>
Am 24.11.18 um 15:51 schrieb Frank Schäfer:
> Am 23.11.18 um 22:47 schrieb Johannes Sixt:
>> Am 23.11.18 um 19:19 schrieb Frank Schäfer:
>>> The CR marker ^M doesn't show up in '-' lines of diffs when the ending
>>> of the removed line is CR+LF.
>>> It shows up as expected in '-' lines when the ending of the removed line
>>> is CR only.
>>> It also always shows up as expected in '+' lines.
>>
>> Is your repository configured to (1) highlight whitespace errors in
>> diff output and (2) to leave CRLF alone in text files?
> I'm using the default configuration, so whitespace is set to
> trailing-space, but cr-at-eol is not set.
>
>>
>> If so, then it is just a side-effect of this combination, an illusion,
>> so to say: The CR in the CRLF combo is trailing whitespace. The 'git
>> diff' marks it by inserting an escape sequence to switch the color
>> before ^M and another escape sequence to reset to color after ^M. This
>> breaks the CRLF combination apart, so that the pager does not process
>> it as a combined CRLF sequence; it displays the lone CR as ^M.
> Urghh... so that needs to be fixed.
> Why does it work correctly with '+' lines ?
I don't think that there is anything to fix. If you have a file with
CRLF in it, but you did not declare to Git that CRLF is the expected
end-of-line indicator, then the CR *is* trailing whitespace (because the
line ends at LF), and 'git diff' highlights it.
-- Hannes
next prev parent reply other threads:[~2018-11-24 22:07 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-23 18:19 BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF Frank Schäfer
2018-11-23 21:47 ` Johannes Sixt
2018-11-24 14:51 ` Frank Schäfer
2018-11-24 15:25 ` Torsten Bögershausen
2018-11-24 22:07 ` Johannes Sixt [this message]
2018-11-25 14:03 ` Frank Schäfer
2018-11-25 21:39 ` Johannes Sixt
2018-11-26 4:02 ` Junio C Hamano
[not found] ` <xmqqzhtwzghr.fsf@gitster-ct.c.googlers.com>
2018-11-26 19:49 ` Johannes Sixt
2018-11-26 23:31 ` Junio C Hamano
2018-11-27 18:15 ` Johannes Sixt
2018-11-27 20:09 ` Frank Schäfer
2018-11-29 2:11 ` Junio C Hamano
2018-12-02 19:31 ` Frank Schäfer
2018-12-02 21:22 ` Johannes Sixt
2018-12-05 19:29 ` Frank Schäfer
2018-12-05 21:31 ` Johannes Sixt
2018-12-03 1:15 ` Junio C Hamano
2018-12-05 19:43 ` Frank Schäfer
2018-12-06 0:58 ` Junio C Hamano
2018-12-06 18:42 ` Frank Schäfer
2018-11-27 20:06 ` Frank Schäfer
2018-11-25 23:50 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=80ffe850-b966-a37b-09bd-44e04d769944@kdbg.org \
--to=j6t@kdbg.org \
--cc=fschaefer.oss@googlemail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).