Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

2015-05-22 Thread David Aguilar
On Fri, May 22, 2015 at 01:05:28PM -0700, Junio C Hamano wrote: > David Aguilar writes: > > > [just wrapping up the unaswered questions in this thread] > > ... > > On Wed, May 20, 2015 at 01:09:29PM +0200, SZEDER Gábor wrote: > > Thanks for clarifications. I think all is good now? Yes, I think

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

2015-05-22 Thread Junio C Hamano
David Aguilar writes: > [just wrapping up the unaswered questions in this thread] > ... > On Wed, May 20, 2015 at 01:09:29PM +0200, SZEDER Gábor wrote: Thanks for clarifications. I think all is good now? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

2015-05-22 Thread David Aguilar
[just wrapping up the unaswered questions in this thread] On Wed, May 20, 2015 at 01:09:29PM +0200, SZEDER Gábor wrote: > > Quoting David Aguilar : > > >+translate_merge_tool_path() { > >+# Use WinMergeU.exe if it exists in $PATH > >+if type -p WinMergeU.exe >/dev/null 2>&1 > >+then

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

2015-05-21 Thread Johannes Schindelin
Hi Junio, On 2015-05-20 23:00, Junio C Hamano wrote: > Sebastian Schuberth writes: > >> On Wed, May 20, 2015 at 10:13 PM, Junio C Hamano wrote: >> >>> David Aguilar writes: >>> + for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' | + cut -d '='

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

2015-05-20 Thread Sebastian Schuberth
On Wed, May 20, 2015 at 11:00 PM, Junio C Hamano wrote: > Yuck. So even though %PROGRAMFILES% and %PROGRAMFILES(X86)% look as > if they are variables that can point at arbitrary places, they in > reality don't? Otherwise %PROGRAMFILES% may point at D:\Program Correct. In the vast majority of

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

2015-05-20 Thread Junio C Hamano
Sebastian Schuberth writes: > On Wed, May 20, 2015 at 10:13 PM, Junio C Hamano wrote: > >> David Aguilar writes: >> >>> + for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' | >>> + cut -d '=' -f 2- | sort -u) >> >> Is the final "sort" really desired? I am wond

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

2015-05-20 Thread Sebastian Schuberth
On Wed, May 20, 2015 at 10:13 PM, Junio C Hamano wrote: > David Aguilar writes: > >> + for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' | >> + cut -d '=' -f 2- | sort -u) > > Is the final "sort" really desired? I am wondering if there are > fixed precedence/p

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

2015-05-20 Thread Junio C Hamano
David Aguilar writes: > + for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' | > + cut -d '=' -f 2- | sort -u) Is the final "sort" really desired? I am wondering if there are fixed precedence/preference order among variants of %PROGRAMFILES% environment variab