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

Re: git blame swallows up lines in case of mixed line endings

From
Torsten Bögershausen <tboegi@web.de>
Date
Feb 21, 2015, 13:45 UTC
Message-ID
<54E88BFA.9050900@web.de>
In-Reply-To
<71BF70CE41AEE741896AF3A5450D86F11F2D1F46@DEFTHW99EH3MSX.ww902.siemens.net>
On 2015-02-19 14.48, Sokolov, Konstantin (ext) wrote:
Show 34 quoted lines
> Hi Folks,
> 
> I encounter unexpected behavior in the following case:
> 
> file content:
> 
> line1<CR><LF>
> line2<CR>
> line3<CR><LF>
> line4
> 
> This is what I get as console output (on Windows):
> 
>> git blame -s file.txt
> 7db36436 1) line1
> line3436 2) line2
> 7db36436 3) line4
> 
> This is the real content:
> 
>> git blame -s file.txt > blame.txt
> 
> blame.txt opened in Notepad++:
> 
> 7db36436 1) line1 <CR><LF>
> 7db36436 2) line2 <CR>
> line3 <CR><LF>
> 7db36436 3) line4 <LF>
> 
> Admittedly, very stupid editors, such as Windows Notepad, cannot handle mixed line endings as well. But is this also the way git blame should behave?
> 
> Kind regards
> Konstantin
>

Git (and other tools) do not handle a single CR as a line ending. A line ending in Git is either CRLF or LF.

A "mixed line ending" in Git sense is a mixture between CRLF and LF, but not a lone CR. (And in this sense it is the expected behavior)

Are you sure you want to use it, or is it a typo ?
Previous: Sokolov, Konstantin (ext)Next: Sokolov, Konstantin (ext)
Message 2 of 6 in “git blame swallows up lines in case of mixed line endings”
  1. Sokolov, Konstantin (ext)Feb 19, 2015
  2. Torsten BögershausenFeb 21, 2015
  3. AW: git blame swallows up lines in case of mixed line endingsSokolov, Konstantin (ext), Feb 23, 2015
  4. Junio C HamanoFeb 23, 2015
  5. AW: git blame swallows up lines in case of mixed line endingsSokolov, Konstantin (ext), Feb 23, 2015
  6. Junio C HamanoFeb 23, 2015

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.