From: Stepan Kasal <kasal@ucw.cz>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Torsten Bögershausen" <tboegi@web.de>,
git@vger.kernel.org,
"Johannes Schindelin" <johannes.schindelin@gmx.de>,
sandals@crustytoothpaste.net
Subject: Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo
Date: Mon, 27 Apr 2015 08:11:16 +0200 [thread overview]
Message-ID: <20150427061115.GB2766@camelia.ucw.cz> (raw)
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
next prev parent reply other threads:[~2015-04-27 6:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-26 12:02 [PATCH/RFC] blame: CRLF in the working tree and LF in the repo Torsten Bögershausen
2015-04-26 18:36 ` Eric Sunshine
2015-04-27 4:39 ` Stepan Kasal
2015-04-27 5:31 ` Junio C Hamano
2015-04-27 6:11 ` Stepan Kasal [this message]
2015-04-27 18:58 ` Johannes Sixt
2015-04-27 19:45 ` Torsten Bögershausen
2015-04-28 18:42 ` Johannes Sixt
2015-04-28 19:52 ` Junio C Hamano
2015-04-28 20:19 ` Johannes Sixt
2015-04-28 21:58 ` Stepan Kasal
2015-04-27 17:47 ` Junio C Hamano
2015-04-27 19:40 ` Torsten Bögershausen
2015-04-28 7:28 ` Junio C Hamano
2015-04-28 7:40 ` Torsten Bögershausen
2015-04-28 1:17 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150427061115.GB2766@camelia.ucw.cz \
--to=kasal@ucw.cz \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=sandals@crustytoothpaste.net \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).