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

[BUG] diff algorithm selection issue

From
Yydirson@free.fr <ydirson@free.fr>
Date
May 26, 2020, 09:36 UTC
Message-ID
<540830445.1034524732.1590485817611.JavaMail.root@zimbra39-e7>
In-Reply-To
<408624876.1034463388.1590484997966.JavaMail.root@zimbra39-e7>
Hi all,

When the config has diff.algorithm=patience set, "git diff --minimal" seems to be ignored, and does not give the same output as "git diff --diff-algorithm=minimal", but really the same as "git diff --diff-algorithm=patience".

See top commit on https://gitlab.com/ydirson/omaha/-/commits/bug/git-diff-minimal where patience diff manages to show a quite braindead diff.

Also, I found it curious that in the manpage the long (--diff-algorithm=minimal) and short (--minimal) forms are described with a copy-paste of the text, and no mention of them being equivalent (or not, for that matter ;).

Next: Junio C Hamano
Message 1 of 6 in “[BUG] diff algorithm selection issue”
  1. ydirson@free.frMay 26, 2020
  2. Junio C HamanoMay 26, 2020
  3. Junio C HamanoMay 26, 2020
  4. ydirson@free.frMay 26, 2020
  5. ydirson@free.frMay 26, 2020
  6. Junio C HamanoMay 26, 2020

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.