From: "Frank Schäfer" <fschaefer.oss@googlemail.com>
To: Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>, 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: Sun, 2 Dec 2018 20:31:47 +0100 [thread overview]
Message-ID: <7a4ecc75-2dc4-041b-3d12-46cddae0a27f@googlemail.com> (raw)
In-Reply-To: <xmqqk1kwr5tp.fsf@gitster-ct.c.googlers.com>
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.
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
next prev parent reply other threads:[~2018-12-02 19:30 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
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 [this message]
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=7a4ecc75-2dc4-041b-3d12-46cddae0a27f@googlemail.com \
--to=fschaefer.oss@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=sandals@crustytoothpaste.net \
/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).