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

[2.22.0] difftool no longer passes through to git diff if diff.tool is unset

From
PLPugh, Logan <logan.pugh@austintexas.gov>
Date
Jun 19, 2019, 23:54 UTC
Message-ID
<SN6PR09MB3248331E45EED2DD26CA55528AE50@SN6PR09MB3248.namprd09.prod.outlook.com>
Note: This issue was originally discussed on this StackOverflow thread: https://stackoverflow.com/q/56675863
Prior to Git version 2.22.0 I was able to use git difftool without configuring diff.tool or merge.tool and it would show the diff using git diff.
E.g. with Git 2.21.0:
~/gits/src/git$ git difftool --no-index color.c color.h
diff --git a/color.c b/color.h
index ebb222ec33..98894d6a17 100644

In Git version 2.22.0 an error message about diff.tool not being configured is displayed:

~/gits/src/git$ git difftool --no-index color.c color.h

This message is displayed because 'diff.tool' is not configured.
See 'git difftool --tool-help' or 'git help config' for more details.
'git difftool' will now attempt to use one of the following tools:
kompare emerge vimdiff

The following commit is thought to have caused the regression: https://github.com/git/git/commit/05fb8726cccc74908853c166248ff9b6abdafae5

Please let me know if I can provide any more info.

Thanks,

Logan
Next: Denton Liu
Message 1 of 8 in “[2.22.0] difftool no longer passes through to git diff if diff.tool is unset”
  1. Pugh, LoganJun 19, 2019
  2. Denton LiuJun 20, 2019
  3. Denton LiuJun 20, 2019
  4. Jeff KingJun 20, 2019
  5. Pugh, LoganJun 20, 2019
  6. Jeff KingJun 25, 2019
  7. Pugh, LoganJun 25, 2019
  8. Jeff KingJun 26, 2019

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.