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

Re: [PATCH] merge-recursive: honor diff.algorithm

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 9, 2024, 18:51 UTC
Message-ID
<xmqqy16ae6vj.fsf@gitster.g>
In-Reply-To
<198a4c00-291f-456d-84ac-082e142bd4fe@delpeuch.eu>
Antonin Delpeuch <antonin@delpeuch.eu> writes:
Show 5 quoted lines
> I have second thoughts about this, perhaps it is possible to refactor
> things a bit further, imitating diff.c which has "git_diff_ui_config"
> and "git_diff_basic_config". In a similar way, we could have
> "init_merge_ui_options" and "init_merge_basic_options" which the
> commands could call depending on whether they are porcelain or plumbing.

It does make sense to treat the internal merge_recursive() function as robust and reliable building block whose behaviour does not get affected by configuration beyond the control of the caller, just like we treat a plumbing command.

Thanks.
Previous: Antonin DelpeuchNext: Antonin Delpeuch via GitGitGadget
Message 3 of 7 in “merge-recursive: honor diff.algorithm”
  1. merge-recursive: honor diff.algorithmAntonin Delpeuch via GitGitGadget, Jul 8, 2024
  2. Antonin DelpeuchJul 9, 2024
  3. Junio C HamanoJul 9, 2024
  4. merge-recursive: honor diff.algorithmAntonin Delpeuch via GitGitGadget, Jul 9, 2024
  5. Junio C HamanoJul 10, 2024
  6. Antonin DelpeuchJul 13, 2024
  7. merge-recursive: honor diff.algorithmAntonin Delpeuch via GitGitGadget, Jul 13, 2024

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.