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

[BUG] Regression in 'git mergetool --tool-help'

From
Philippe Blain <levraiphilippeblain@gmail.com>
Date
Dec 19, 2020, 04:23 UTC
Message-ID
<CADtb9DyozjgAsdFYL8fFBEWmq7iz4=prZYVUdH9W-J5CKVS4OA@mail.gmail.com>
Hi all,

It seems that 83bbf9b92e (mergetool--lib: improve support for vimdiff-style tool variants, 2020-07-29) introduced a regression in the output shown by 'git mergetool --tool-help'. Even if I have 'meld', 'kdiff3' and 'xxdiff' installed and in PATH, they are not shown at all when the above command is invoked. Only vimdiff, gvimdiff and their *2 and *3 variants are listed.

The commit above was found by bisecting starting from 2.29.2 knowing 2.26.0 is OK. I can reproduce the bug on Ubuntu 18 and Ubuntu 14 but not on Ubuntu 20 (all LTS versions and all with Git 2.29.2) so maybe something else is also at play here...

Cheers,
Philippe.
Next: Felipe Contreras
Message 1 of 13 in “[BUG] Regression in 'git mergetool --tool-help'”
  1. Philippe BlainDec 19, 2020
  2. Felipe ContrerasDec 19, 2020
  3. Junio C HamanoDec 19, 2020
  4. Felipe ContrerasDec 19, 2020
  5. Junio C HamanoDec 19, 2020
  6. Philippe BlainDec 20, 2020
  7. Johannes SixtDec 20, 2020
  8. René ScharfeDec 20, 2020
  9. Junio C HamanoDec 20, 2020
  10. Philippe BlainDec 20, 2020
  11. Junio C HamanoDec 21, 2020
  12. Junio C HamanoDec 20, 2020
  13. Junio C HamanoDec 19, 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.