Re: [PATCH v1 6/7] correct blame for files commited with CRLF

2016-03-30 Thread Torsten Bögershausen
7/7 needs to be amended with something like this, and the documentation needs an update. In any case, the user can normalize the repo like this: $ echo "* text=auto" >>.gitattributes $ rm .git/index # Remove the index to force Git to $ git reset # re-scan the working directory $ git st

Re: [PATCH v1 6/7] correct blame for files commited with CRLF

2016-03-29 Thread Junio C Hamano
Junio C Hamano writes: > Junio C Hamano writes: > >> Torsten Bögershausen writes: >> >>> If we had made the CRLF -> LF conversion, yes. But we don't do that. >>> crlf_to_git() returns without touching the line endings. >> >> That sounds quite broken. How would a user ever fix broken data in >>

Re: [PATCH v1 6/7] correct blame for files commited with CRLF

2016-03-29 Thread Junio C Hamano
Junio C Hamano writes: > Torsten Bögershausen writes: > >> If we had made the CRLF -> LF conversion, yes. But we don't do that. >> crlf_to_git() returns without touching the line endings. > > That sounds quite broken. How would a user ever fix broken data in > the index then? I know the commit

Re: [PATCH v1 6/7] correct blame for files commited with CRLF

2016-03-29 Thread Junio C Hamano
Torsten Bögershausen writes: > If we had made the CRLF -> LF conversion, yes. But we don't do that. > crlf_to_git() returns without touching the line endings. That sounds quite broken. How would a user ever fix broken data in the index then? I know the commit that often appears in these discus

Re: [PATCH v1 6/7] correct blame for files commited with CRLF

2016-03-29 Thread Junio C Hamano
Torsten Bögershausen writes: > # Here the lines are not going to be normalized at the next commit. > # They stay CRLF. Isn't that the real source of the problem? Why don't we fix that then? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@

Re: [PATCH v1 6/7] correct blame for files commited with CRLF

2016-03-29 Thread Torsten Bögershausen
On 29.03.16 19:21, Junio C Hamano wrote: > tbo...@web.de writes: > >> From: Torsten Bögershausen >> >> git blame reports lines as not "Not Committed Yet" when they have >> CRLF in the index, CRLF in the worktree and e.g. core.autocrlf is true. >> >> Since commit c48053 "new safer autocrlf handlin

Re: [PATCH v1 6/7] correct blame for files commited with CRLF

2016-03-29 Thread Junio C Hamano
tbo...@web.de writes: > From: Torsten Bögershausen > > git blame reports lines as not "Not Committed Yet" when they have > CRLF in the index, CRLF in the worktree and e.g. core.autocrlf is true. > > Since commit c48053 "new safer autocrlf handling", files that have CRLF > in the index are not nor

[PATCH v1 6/7] correct blame for files commited with CRLF

2016-03-29 Thread tboegi
From: Torsten Bögershausen git blame reports lines as not "Not Committed Yet" when they have CRLF in the index, CRLF in the worktree and e.g. core.autocrlf is true. Since commit c48053 "new safer autocrlf handling", files that have CRLF in the index are not normalized at commit when e.g. core.au