From: Junio C Hamano Date: Thu, 31 Dec 2009 20:37:31 GMT Subject: Re: [PATCH] gitk: Use git-difftool for external diffs Message-ID: <7vbpheswvo.fsf@alter.siamese.dyndns.org> In-Reply-To: <20091231071642.GA10067@gmail.com> David Aguilar writes: > I started the first step: > > http://thread.gmane.org/gmane.comp.version-control.git/135613 > http://thread.gmane.org/gmane.comp.version-control.git/135613/focus=135612 Thanks. > The 2nd patch implements the the --gui option which Markus > pointed out would be needed to avoid issues such as calling > "vimdiff" from a console-less gitk: > > http://article.gmane.org/gmane.comp.version-control.git/133386 > > I marked the --gui patch as "RFC" since it introduced a new > config variable and I want to make sure that we agreed on its > name. I didn't get any feedback about that patch > (my fault-- we were in RC freeze and I forgot to CC: Markus). I don't think "diff.guitool" would hurt. However,... I think the "--gui" patch is a more or less independent issue to "gitk runs external diff through difftool", because difftool/mergetool already have a built-in way to auto-guess which backend to use depending on what its environment looks like (e.g. do we have $DISPLAY etc.). The "--gui" patch is about giving a more explicit way for the caller to control that backend picking decision process and it is more like icing than a prerequisite for the issue. IOW, I think the end result will be usable by gitk users even if they do not configure "diff.guitool".