git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Finn Arne Gangstad <finnag@pvv.org>
Date
Jun 25, 2010, 08:00 UTC
Message-ID
<20100625080043.GB4734@pvv.org>
In-Reply-To
<4C244278.10407@viscovery.net>
On Fri, Jun 25, 2010 at 07:45:28AM +0200, Johannes Sixt wrote:
Show 8 quoted lines
> Am 6/24/2010 22:44, schrieb Eyvind Bernhardsen:
> > 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
Previous: Eyvind Bernhardsen
Message 9 of 9 in “Help merging when text has been normalized”
  1. 0/3 Help merging when text has been normalizedEyvind Bernhardsen, Jun 24, 2010
  2. 1/3 Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen, Jun 24, 2010
  3. 2/3 Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen, Jun 24, 2010
  4. 3/3 Don't expand CRLFs when normalizing text during mergeEyvind Bernhardsen, Jun 24, 2010
  5. Johannes SixtJun 25, 2010
  6. Eyvind BernhardsenJun 25, 2010
  7. Johannes SixtJun 25, 2010
  8. Eyvind BernhardsenJun 25, 2010
  9. Finn Arne GangstadJun 25, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.