From: Denton Liu <liu.denton@gmail.com>
To: "Pugh, Logan" <Logan.Pugh@austintexas.gov>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [2.22.0] difftool no longer passes through to git diff if diff.tool is unset
Date: Wed, 19 Jun 2019 21:17:44 -0400 [thread overview]
Message-ID: <20190620011744.GA3696@archbookpro.localdomain> (raw)
In-Reply-To: <SN6PR09MB3248331E45EED2DD26CA55528AE50@SN6PR09MB3248.namprd09.prod.outlook.com>
Hi Logan,
On Wed, Jun 19, 2019 at 11:54:22PM +0000, Pugh, Logan wrote:
> 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
Thanks for the report. I'll take a look at this later today.
next prev parent reply other threads:[~2019-06-20 1:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 23:54 [2.22.0] difftool no longer passes through to git diff if diff.tool is unset Pugh, Logan
2019-06-20 1:17 ` Denton Liu [this message]
2019-06-20 2:45 ` Denton Liu
2019-06-20 5:21 ` Jeff King
2019-06-20 19:29 ` Pugh, Logan
2019-06-25 21:35 ` Jeff King
2019-06-25 23:09 ` Pugh, Logan
2019-06-26 18:08 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190620011744.GA3696@archbookpro.localdomain \
--to=liu.denton@gmail.com \
--cc=Logan.Pugh@austintexas.gov \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).