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

Re: Can I convince the diff algorithm to behave better?

From
Christian Couder <christian.couder@gmail.com>
Date
Mar 4, 2021, 09:52 UTC
Message-ID
<CAP8UFD1gFA2DyyjyfJ7pKNRyqO2=Y2BOyF0Aeni3GXvgeL8Wtg@mail.gmail.com>
In-Reply-To
<CA+cU71=FfReSG411Feo=vmkw4MdK4KDgokP1jH6uwOkC_0AbYA@mail.gmail.com>
On Thu, Mar 4, 2021 at 8:37 AM Tom Ritter <tom@ritter.vg> wrote:
[...]
Show 7 quoted lines
> Obviously there's nothing incorrect about the former diff, I just wish
> it was the latter rather than the former.
>
> I know that git includes four diff algorithms; in my testing patience
> or histogram exacerbated the problem; and none of them improved upon
> it.  If anyone has suggestions I'd be curious to know if there's
> anything that could be done...

It's not so easy to implement good diff algorithms. You might want to take a look at the "v2.11 new diff heuristic?" article in:

https://git.github.io/rev_news/2016/12/14/edition-22/

Best, Christian.

Previous: Jonathan Tan
Message 4 of 4 in “Can I convince the diff algorithm to behave better?”
  1. Tom RitterMar 3, 2021
  2. Thomas BraunMar 3, 2021
  3. Jonathan TanMar 3, 2021
  4. Christian CouderMar 4, 2021

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.