Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo
- From
Stepan Kasal <kasal@ucw.cz>
- Date
- Apr 27, 2015, 06:11 UTC
- Message-ID
- <20150427061115.GB2766@camelia.ucw.cz>
- In-Reply-To
- <xmqqzj5uxhls.fsf@gitster.dls.corp.google.com>
Hello,
On Sun, Apr 26, 2015 at 10:31:11PM -0700, Junio C Hamano wrote:
> [...] the commit you are proposing to revert [4d4813a5] > was a misguided attempt to "fix" a non issue, [...]
yes, it was this. So I propose to remove the whole commit, including the test case and add two new test cases.
Details:
Git does not support CRLF as the internal line separator. If you commit file in binary mode with CRLF, you are on your own.
If you then recode the file in the working tree to use LF, no wonder things break.
If you do it indirectly, by setting the file mode to "text", things break exactly the same way.
And that is the case that 4d4813a5 wanted to fix, cf the test case in it.
OTOH, the commit has broken the most recommended scenario for Windows: LF in the repo, CRLF in the work tree.
Thanks, Stepan