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

Re: git blame breaking on repository with CRLF files

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Aug 10, 2015, 23:54 UTC
Message-ID
<20150810235403.GC9420@vauxhall.crustytoothpaste.net>
In-Reply-To
<B0BFE3BB9B3E8C4A890D53FA460552D373734199@DEWDFEMB16B.global.corp.sap>
On Mon, Aug 10, 2015 at 08:36:35AM +0000, Benkstein, Frank wrote:
Show 12 quoted lines
> You are correct that it is also wrong in git v1.7.0.  However, it is correct in
> v2.4.0.
> 
> Another bisect gave me this commit which was included in v2.0.1:
> 
>  commit 4d4813a52f3722854a54bab046f4abfec13ef6ae
>  Author: brian m. carlson <sandals@crustytoothpaste.net>
>  Date:   Sat Apr 26 23:10:40 2014 +0000
> 
>      blame: correctly handle files regardless of autocrlf
> 
> So this still looks like a regression v2.5.0 to me.

This commit was reverted because it was decided that it wasn't the right way to handle the problem and it broke other things. The complexity of the CRLF handling is a bit beyond me, to be honest. I'm sure I'd understand it better if I used it more, but I'm a Unix guy.

I stand by my earlier statement that we should improve the documentation in this area, because it's a common source of confusion.

-- 
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
Previous: Benkstein, FrankNext: Junio C Hamano
Message 5 of 7 in “git blame breaking on repository with CRLF files”
  1. Benkstein, FrankAug 7, 2015
  2. Torsten BögershausenAug 8, 2015
  3. Torsten BögershausenAug 9, 2015
  4. Benkstein, FrankAug 10, 2015
  5. brian m. carlsonAug 10, 2015
  6. Junio C HamanoAug 10, 2015
  7. Torsten BögershausenAug 10, 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.