From: Eric Sunshine <sunshine@sunshineco.com>
Date: Sun, 26 Apr 2015 18:36:00 GMT
Subject: Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo
Message-ID: <CAPig+cT3rpEFVerjxA9vCXh0wFdmwBhDEnvgk1hBumsSAtDcVw@mail.gmail.com>
In-Reply-To: <553CD3DA.9090700@web.de>

On Sun, Apr 26, 2015 at 8:02 AM, Torsten Bögershausen <tboegi@web.de> 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 <kasal@ucw.cz>
> Signed-off-by: Torsten Bögershausen <tboegi@web.de>