From: Wincent Colaiuta <win@wincent.com>
Date: Sun, 22 Mar 2009 15:57:20 GMT
Subject: Re: What's cooking in git.git (Mar 2009, #06; Sat, 21)
Message-ID: <150271EF-9B2B-4B48-9A17-F9E423830E60@wincent.com>
In-Reply-To: <20090321185817.GA22540@gmail.com>

El 21/3/2009, a las 19:58, David Aguilar escribió:

> On  0, Wincent Colaiuta <win@wincent.com> wrote:
>> El 21/3/2009, a las 8:58, Junio C Hamano escribió:
>>
>>> * da/difftool (Thu Mar 19 01:25:25 2009 -0700) 1 commit
>>> - difftool: move 'git-difftool' out of contrib
>>
>> Before this one goes any further, I noticed that nobody replied to my
>> email on this thread a few days ago:
>>
>> http://article.gmane.org/gmane.comp.version-control.git/113609
>>
>> My concern was:
>>
>>> 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.
>>
>>
>> What do people think?
>>
>> Cheers,
>> Wincent
>
> That could be interesting.  git-difftool is just a
> frontend to git-diff so there isn't really any maintenance
> worries about keeping the options in sync.  I do agree that
> keeping things easy for users is a noble goal and that that
> was your only concern.
>
> git-difftool is pure porcelain, so I'm interested in how we
> could implement this.  Right now the call stack is:
>
> $ git difftool
> ... GIT_EXT_DIFF=git-difftool-helper
> ... git diff
> ... ... git-difftool-helper
> ... ... ... xxdiff
>
>
> What should it look like instead?
>
> Are you envisioning this (1):
>
> $ git diff --tool
> ... --tool was passed, so set GIT_EXT_DIFF?
> ... git-difftool-helper
> ... ... xxdiff ...

Yeah, something like that. I wasn't actually imagining that the logic  
of git-difftool-helper would itself be rolled into "git diff". I was  
just wondering if we could keep the command-count down.

Cheers,
Wincent