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

2019-06-26 Thread Jeff King
On Tue, Jun 25, 2019 at 11:09:08PM +, Pugh, Logan wrote: > > Or in your case I suppose even better would just be an > > option like "--if-not-configured-just-use-regular-diff". Then it would > > do what you want, without impacting users who do want the interactive > > setup. > > If such an op

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

2019-06-25 Thread Pugh, Logan
> Well, it _is_ true that you can use it the same way. It's just that you > need to configure it to use whatever 3rd-party tool you want (and if you > do not want to configure a tool, then you are better off just using > git-diff directly). It was only due to a bug/historical accident that it > beh

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

2019-06-25 Thread Jeff King
On Thu, Jun 20, 2019 at 07:29:36PM +, Pugh, Logan wrote: > Thanks for the explanation. It sounds like I was under the incorrect > assumption that I could use the difftool command the same way as the > diff command. Part of my confusion could be blamed on the git-difftool > documentation (ht

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

2019-06-20 Thread Pugh, Logan
> On Wed, Jun 19, 2019 at 10:45:17PM -0400, Denton Liu wrote: > >> Using the following command on git.git, >> >> $ HOME=/dev/null ./git --exec-path=. difftool --no-index color.c color.h >> >> I did a quick bisect on the issue and it seems like the cause of this >> bug is actually 287ab28bfa

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

2019-06-19 Thread Jeff King
On Wed, Jun 19, 2019 at 10:45:17PM -0400, Denton Liu wrote: > Using the following command on git.git, > > $ HOME=/dev/null ./git --exec-path=. difftool --no-index color.c color.h > > I did a quick bisect on the issue and it seems like the cause of this > bug is actually 287ab28bfa (diff: r

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

2019-06-19 Thread Denton Liu
On Wed, Jun 19, 2019 at 09:17:44PM -0400, Denton Liu wrote: > Hi Logan, > > On Wed, Jun 19, 2019 at 11:54:22PM +, 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

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

2019-06-19 Thread Denton Liu
Hi Logan, On Wed, Jun 19, 2019 at 11:54:22PM +, 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 an

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

2019-06-19 Thread Pugh, Logan
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$ g