Re: [PATCH] contrib/difftool: use a separate config namespace for difftool commands

From: Wincent Colaiuta <win@wincent.com>
Date: Mar 18, 2009, 10:53 UTC
Message-ID: <EBA0E851-C259-4CA7-BF59-302300C0C3DC@wincent.com>
In-Reply-To: <20090318043543.GB13653@gmail.com>

El 18/3/2009, a las 5:35, David Aguilar escribió:

Show 32 quoted lines

> Junio C Hamano <gitster@pobox.com> wrote:
>> Markus Heidelberg <markus.heidelberg@web.de> writes:
>>
>>> Jay Soffian <jaysoffian@gmail.com> wrote:
>>>>
>>>> Aside, (for Junio I guess...), what's the reason this command is in
>>>> contrib, and by what criteria might it graduate to being installed
>>>> with the rest of the git commands?
>>>>
>>>> j.
>>>
>>> I'd like to see it as a general git tool, too.
>>> Maybe it can even share some common functionality with git- 
>>> mergetool.
>>
>> The code was copied and pasted very heavily, and I think (IIRC) the  
>> author
>> was a bit too ashamed to have it outside contrib/ before it is  
>> properly
>> refactored or something like that.  Which I happen to agree with,  
>> by the
>> way.
>
> I'll work on some patches to get the ball rolling on this.
>
>
> Here's what I see as the steps I would take:
>
> 1. move difftool into the root, update Makefile, etc.
>
> 2. factor out the similarities between merge/difftool and
> put them in maybe git-tool-lib.sh?

Given that git-difftool shares basically all the same options as "git diff", I think a good long-term plan would be looking at adding the "-- tool" option to "git diff" itself so that users wouldn't have to learn a new subcommand, just a new option.

(Whether this is done by rolling the functionality of "git-difftool" into "git diff" itself, or delegating to a separate "git-difftool" command doesn't matter so much, now that most commands are neatly tucked away in $(git --exec-path) now.)

Cheers, Wincent