Re: What's cooking in git.git (preview)

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 9, 2017, 11:36 UTC
Message-ID: <alpine.DEB.2.20.1701091228460.3469@virtualbox>
In-Reply-To: <xmqqmvf0yke0.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Sun, 8 Jan 2017, Junio C Hamano wrote:

Show 9 quoted lines

> * js/difftool-builtin (2017-01-08) 4 commits
>  - t7800: run both builtin and scripted difftool, for now
>  - difftool: implement the functionality in the builtin
>  - difftool: add a skeleton for the upcoming builtin
>  - git_exec_path: avoid Coverity warning about unfree()d result
> 
>  Rewrite a scripted porcelain "git difftool" in C.
> 
>  What's the doneness of this topic?

There was only one bug report since the first iteration, and it has been fixed as of v4.

The git_exec_path patch is a bit unrelated and should probably be split out.

The "t7800: run both" patch should not be merged to `next` (or beyond).

I will prepare a proper v5 soon that replaces the t7800 patch by a patch retiring the Perl script to contrib/.

Ciao, Dscho