Re: [PATCH v2 1/1] difftool: add the builtin

2016-11-24 Thread Johannes Schindelin
Hi Junio, On Wed, 23 Nov 2016, Junio C Hamano wrote: > Junio C Hamano writes: > > > ... I do not think you can safely add these two bits here until the > > migration completes. > > I accidentally removed a more useful bit I wrote after the above > sentence while editing. > > The NEEDSWORK com

Re: [PATCH v2 1/1] difftool: add the builtin

2016-11-23 Thread Junio C Hamano
Junio C Hamano writes: > ... I do not think you can safely add these two bits here until the > migration completes. I accidentally removed a more useful bit I wrote after the above sentence while editing. The NEEDSWORK comment in 73c2779f42 ("builtin-am: implement skeletal builtin am", 2015-08-

Re: [PATCH v2 1/1] difftool: add the builtin

2016-11-23 Thread Junio C Hamano
Johannes Schindelin writes: > + if (!strcmp(var, "core.usebuiltindifftool")) { > + use_builtin_difftool = git_config_bool(var, value); > + return 0; > + } This no way belongs to the core set; difftool.usebuiltin would be more appropriate. > + if (!use_builtin

[PATCH v2 1/1] difftool: add the builtin

2016-11-23 Thread Johannes Schindelin
This adds a builtin difftool that represents a conversion of the current Perl script version of the difftool. The motivation is that Perl scripts are not at all native on Windows, and that `git difftool` therefore is pretty slow on that platform, when there is no good reason for it to be slow. In