Re: [PATCH 2/2] difftool: add a feature flag for the builtin vs scripted version

2016-11-23 Thread Johannes Schindelin
Hi Dennis, On Wed, 23 Nov 2016, Johannes Schindelin wrote: > On Wed, 23 Nov 2016, Dennis Kaarsemaker wrote: > > > On Tue, 2016-11-22 at 18:01 +0100, Johannes Schindelin wrote: > > > The original idea was to use an environment variable > > > GIT_USE_BUILTIN_DIFFTOOL, but the test suite resets

Re: [PATCH 2/2] difftool: add a feature flag for the builtin vs scripted version

2016-11-23 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Wed, 23 Nov 2016, Junio C Hamano wrote: > >> Junio C Hamano writes: >> >> > Can't you route the control upon seeing "git difftool" to your >> > experimental "C" difftool and check the configuration

Re: [PATCH 2/2] difftool: add a feature flag for the builtin vs scripted version

2016-11-23 Thread Johannes Schindelin
Hi Junio, On Wed, 23 Nov 2016, Junio C Hamano wrote: > Junio C Hamano writes: > > > Can't you route the control upon seeing "git difftool" to your > > experimental "C" difftool and check the configuration there? Then > > you can decide to run_command() a non-builtin one

Re: [PATCH 2/2] difftool: add a feature flag for the builtin vs scripted version

2016-11-23 Thread Junio C Hamano
Junio C Hamano writes: > Can't you route the control upon seeing "git difftool" to your > experimental "C" difftool and check the configuration there? Then > you can decide to run_command() a non-builtin one depending what the > configuration says---that way, you would incur

Re: [PATCH 2/2] difftool: add a feature flag for the builtin vs scripted version

2016-11-23 Thread Junio C Hamano
Johannes Schindelin writes: > The downside is that we actually *do* go through Perl to do that. Only to > go back to a builtin. Which is exactly the thing I intended to avoid. > > If we do not go through Perl, we have to set up the git directory and > parse the config

Re: [PATCH 2/2] difftool: add a feature flag for the builtin vs scripted version

2016-11-23 Thread Johannes Schindelin
Hi Dennis, On Wed, 23 Nov 2016, Dennis Kaarsemaker wrote: > On Tue, 2016-11-22 at 18:01 +0100, Johannes Schindelin wrote: > > The original idea was to use an environment variable > > GIT_USE_BUILTIN_DIFFTOOL, but the test suite resets those variables, and > > we do want to use that feature flag

Re: [PATCH 2/2] difftool: add a feature flag for the builtin vs scripted version

2016-11-23 Thread Dennis Kaarsemaker
On Tue, 2016-11-22 at 18:01 +0100, Johannes Schindelin wrote: > The original idea was to use an environment variable > GIT_USE_BUILTIN_DIFFTOOL, but the test suite resets those variables, and > we do want to use that feature flag to run the tests with, and without, > the feature flag. > >

[PATCH 2/2] difftool: add a feature flag for the builtin vs scripted version

2016-11-22 Thread Johannes Schindelin
The popular difftool command was just converted into a builtin, for better performance on Windows as well as to reduce the number of Perl scripts (so that we may, in the very long run, be able to ship Git for Windows without any Perl interpreter at all). However, it would be sloppy practice to