Re: [PATCH 6/7] mergetools: Fix difftool/mergetool --tool-help listing for vim

2013-01-25 Thread Junio C Hamano
David Aguilar writes: > On Fri, Jan 25, 2013 at 2:38 AM, John Keeping wrote: >> On Fri, Jan 25, 2013 at 01:43:53AM -0800, David Aguilar wrote: >>> "git difftool --tool-help" and "git mergetool --tool-help" incorreclty >>> list "vim" as being an unavailable tool. This is because they attempt >>>

Re: [PATCH 6/7] mergetools: Fix difftool/mergetool --tool-help listing for vim

2013-01-25 Thread Sebastian Schuberth
On Fri, Jan 25, 2013 at 11:34 AM, Sebastian Schuberth wrote: >> I thought Git did something sensible there like create a normal file? > > It does not. Also see my answer over here: > http://stackoverflow.com/questions/11412028/git-not-storing-symlink-as-a-symlink-on-windows/11412341#11412341 Thi

Re: [PATCH 6/7] mergetools: Fix difftool/mergetool --tool-help listing for vim

2013-01-25 Thread David Aguilar
On Fri, Jan 25, 2013 at 2:38 AM, John Keeping wrote: > On Fri, Jan 25, 2013 at 01:43:53AM -0800, David Aguilar wrote: >> "git difftool --tool-help" and "git mergetool --tool-help" incorreclty >> list "vim" as being an unavailable tool. This is because they attempt >> to find a tool named accordin

Re: [PATCH 6/7] mergetools: Fix difftool/mergetool --tool-help listing for vim

2013-01-25 Thread John Keeping
On Fri, Jan 25, 2013 at 01:43:53AM -0800, David Aguilar wrote: > "git difftool --tool-help" and "git mergetool --tool-help" incorreclty > list "vim" as being an unavailable tool. This is because they attempt > to find a tool named according to the mergetool scriptlet instead of the Git- > recogniz

Re: [PATCH 6/7] mergetools: Fix difftool/mergetool --tool-help listing for vim

2013-01-25 Thread David Aguilar
On Fri, Jan 25, 2013 at 2:23 AM, Sebastian Schuberth wrote: > On 2013/01/25 10:43 , David Aguilar wrote: > >> Remove the exception for "vim" and allow the scriptlets to be found >> naturally by using symlinks to a single "vimdiff" scriptlet. This > > > I guess that won't work on platforms where G

Re: [PATCH 6/7] mergetools: Fix difftool/mergetool --tool-help listing for vim

2013-01-25 Thread Sebastian Schuberth
On 2013/01/25 10:43 , David Aguilar wrote: Remove the exception for "vim" and allow the scriptlets to be found naturally by using symlinks to a single "vimdiff" scriptlet. This I guess that won't work on platforms where Git does not support symlinks, then, like Windows. But Windows has (g)vi

[PATCH 6/7] mergetools: Fix difftool/mergetool --tool-help listing for vim

2013-01-25 Thread David Aguilar
"git difftool --tool-help" and "git mergetool --tool-help" incorreclty list "vim" as being an unavailable tool. This is because they attempt to find a tool named according to the mergetool scriptlet instead of the Git- recognized tool name. vimdiff, vimdiff2, gvimdiff, and gvimdiff2 are all provi