git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Bug: Problem with CRLF line ending in git-diff with coloring

From
SHStefan-W. Hahn <stefan.hahn@s-hahn.de>
Date
Feb 14, 2014, 16:47 UTC
Message-ID
<20140214164709.GI7560@pille.home>
In-Reply-To
<20140209110155.GB16189@scotty.home>
Mail von Stefan-W. Hahn, Sun, 09 Feb 2014 at 12:01:55 +0100:
Good afternoon,

I updated the test a little bit. Test 3 and 7 are going wrong. Both tests have a CRLF line ending in the changed line.

I you redirect the output of the test to a file you see the main problem:

,----
| -+Zeile 22

| ++Zeile 22

`----
> It's the right solution. IOW, you should place something like this in
> your .gitattributes:
>  *.html whitespace=cr-at-eol

Sorry, but this is not possible, because I have files of both sorts (mainly C/C++) files in my repository and cannot change the files as I wish.

With kind regards, Stefan

-- 
Stefan-W. Hahn                          It is easy to make things.
                                        It is hard to make things simple.
Previous: Johannes SixtNext: Johannes Sixt
Message 3 of 6 in “Bug: Problem with CRLF line ending in git-diff with coloring”
  1. Stefan-W. HahnFeb 9, 2014
  2. Johannes SixtFeb 9, 2014
  3. Stefan-W. HahnFeb 14, 2014
  4. Johannes SixtFeb 14, 2014
  5. Stefan-W. HahnFeb 15, 2014
  6. Stefan-W. HahnFeb 14, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.