Re: [PATCH v3 3/3] Don't expand CRLFs when normalizing text during merge

On Fri, Jun 25, 2010 at 07:45:28AM +0200, Johannes Sixt wrote:

Am 6/24/2010 22:44, schrieb Eyvind Bernhardsen:

quoted

There's no need to expand CRLFs when convert_to_working_tree() is called
to normalize text for a merge since the text will be converted back
immediately.  Improves performance of merges with conflicting line
endings when core.eol=crlf or core.autocrlf=true.

Pardon me, first you make a big deal about normalization for merges, only
that you finally omit it? What am I missing?

He calls convert_to_working_tree and then immediately calls
convert_to_git again.  convert_to_git will still convert CRLF to LF
where appropriate, so the end result will be the same. There is no
reason to go through an "expensive" conversion of LF->CRLF in
convert_to_working_tree first.

- Finn Arne