Thread (3 messages) 3 messages, 3 authors, 2016-06-15

Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo

flat view

From: Eric Sunshine <hidden>
Date: 2016-06-15 23:04:33

On Sun, Apr 26, 2015 at 8:02 AM, Torsten Bögershausen [off-list ref] wrote:
A typicall setup under Windows:
s/typicall/typical/
core.eol is CRLF and a file is marked as "text" in .gitattributes.

After 4d4813a5 "git blame" no longer works as expected,
every line is annotated as "Not Committed Yet",
even though the working directory is clean.

commit 4d4813a5 removed the conversion in blame.c for all files,
with or without CRLF in the repo.

Having files with CRLF in the repo and core.autocrlf=input is a temporary
situation, the files should be normalized in the repo.
Blaming them with "Not Committed Yet" is OK.

The solution is to revert commit 4d4813a5.

Reported-By: Stepan Kasal <redacted>
Signed-off-by: Torsten Bögershausen <redacted>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help