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

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 2, 2013, 02:08 UTC
Message-ID: <7vehgz8o31.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAJDDKr4L3efzp6eBdTKQxXu8sfvyT91bK6MNh5OhXzWvms8TtQ@mail.gmail.com>

David Aguilar <davvid@gmail.com> writes:

Show 9 quoted lines

> On Fri, Feb 1, 2013 at 12:16 PM, Sven Strickroth
> <sven.strickroth@tu-clausthal.de> 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?

Haven't merged it to 'next'; I will replace with this, with a bit of retitling to make it shorter.

commit 81ed7b9581f7eafb334824264abb492d85a5ffb8
Author: Sven Strickroth <sven.strickroth@tu-clausthal.de>
Date:   Fri Feb 1 21:16:30 2013 +0100

    mergetools: teach tortoisemerge to handle filenames with SP correctly
    
    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 caused the whole
    argument instead of just the file name to be quoted in case of file
    names with spaces. So TortoiseMerge was passed
    
        "-base:new file.txt"
    
    instead of
    
        -base:"new file.txt"
    
    (including the quotes). To work around this, TortoiseGitMerge does not
    require the ":" after the arguments anymore which fixes handling file
    names with spaces [2] (as written above).
    
    [1] http://www.mingw.org/wiki/Posix_path_conversion
    [2] https://github.com/msysgit/msysgit/issues/57
    
    Signed-off-by: Sven Strickroth <email@cs-ware.de>
    Reported-by: Sebastian Schuberth <sschuberth@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>