Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with spaces with TortoiseGitMerge

2013-02-01 Thread Junio C Hamano
David Aguilar writes: > On Fri, Feb 1, 2013 at 12:16 PM, Sven Strickroth > wrote: >> TortoiseMerge caused to whole >> argument instead of just the file name to be quoted > > s/caused to whole/caused the whole/ > > I think this commit message is very nice. Is it too late to replace > the current

Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with spaces with TortoiseGitMerge

2013-02-01 Thread David Aguilar
On Fri, Feb 1, 2013 at 12:16 PM, Sven Strickroth wrote: > TortoiseMerge caused to whole > argument instead of just the file name to be quoted s/caused to whole/caused the whole/ I think this commit message is very nice. Is it too late to replace the current patch with this one? -- David -- To

Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with spaces with TortoiseGitMerge

2013-02-01 Thread Sven Strickroth
TortoiseGitMerge, unlike TortoiseMerge, can be told to handle paths with spaces in them by using -option "$FILE" (not -option:"$FILE", which does not work for such paths) syntax. This change was necessary because of MSYS path mangling [1], the ":" after the "base" etc. arguments to TortoiseMerge c

Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with

2013-02-01 Thread Sven Strickroth
Am 01.02.2013 21:15 schrieb Junio C Hamano: >> TortoiseGitMerge is an improved version of TortoiseMerge specifically >> for use with Git on Windows. Due to MSYS path mangling [1], the ":" >> after the "base" etc. arguments to TortoiseMerge caused to whole >> argument instead of just the file name t

Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with

2013-02-01 Thread Sven Strickroth
Am 01.02.2013 21:07 schrieb Sebastian Schuberth: > mergetools: Teach tortoisemerge about TortoiseGitMerge This subject doesn't make any sense if we don't combine the two patches. -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- To unsubscribe from this list: send the li

Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with

2013-02-01 Thread Junio C Hamano
Sebastian Schuberth writes: > The commit message still does not mention MSYS path mangling at all, > which probably is why the reasoning of this patch was not yet fully > understood. Ahh, you are very right. I didn't realize that was what this funny "with colon, with SP" business was about. >

Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with

2013-02-01 Thread Sebastian Schuberth
On Fri, Feb 1, 2013 at 8:33 PM, Sven Strickroth wrote: > TortoiseGitMerge, unlike TortoiseMerge, can be told to handle paths > with spaces in them by using -option "$FILE" (not -option:"$FILE", > which does not work for such paths) syntax. Both do not have a fully > posix compatible cli parameter

[PATCH] mergetools: Enable tortoisemerge to handle filenames with

2013-02-01 Thread Sven Strickroth
spaces with TortoiseGitMerge TortoiseGitMerge, unlike TortoiseMerge, can be told to handle paths with spaces in them by using -option "$FILE" (not -option:"$FILE", which does not work for such paths) syntax. Both do not have a fully posix compatible cli parameter parser, however, TortoiseGitMerge