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

Re: [RFC] ll-merge: Normalize files before merging

From
Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Date
Jun 11, 2010, 08:47 UTC
Message-ID
<4C11F830.3050404@gmail.com>
In-Reply-To
<20100611083641.GB31109@pvv.org>
On 11. juni 2010 10:36, Finn Arne Gangstad wrote:
Show 6 quoted lines
> It would probably be more correct to do
>
> conert_to_git(convert_to_work_tree(x)) for the parts taken from base
> and theirs, in theory I guess that this can be true:
>
> convert_to_git(x) != convert_to_git(convert_to_work_tree(x))

Interesting idea, might be a bit slow perhaps? I'll do some benchmarketing. Incidentally, it has to convert_to_work_tree() "ours" as well, since the merge code doesn't read anything from the worktree.

I think convert_to_git(convert_to_work_tree(x)) is actually less likely to cause trouble than convert_to_git(convert_to_git(x)), which is what blind normalization would end up doing for at least one side of the merge.

- Eyvind
Previous: Finn Arne GangstadNext: Junio C Hamano
Message 6 of 8 in “[RFC] ll-merge: Normalize files before merging”
  1. Eyvind BernhardsenJun 10, 2010
  2. Johannes SixtJun 11, 2010
  3. Eyvind BernhardsenJun 11, 2010
  4. Johannes SixtJun 11, 2010
  5. Finn Arne GangstadJun 11, 2010
  6. Eyvind BernhardsenJun 11, 2010
  7. Junio C HamanoJun 11, 2010
  8. Eyvind BernhardsenJun 11, 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.