From: Sven Strickroth <sven.strickroth@tu-clausthal.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Sebastian Schuberth <sschuberth@gmail.com>,
git@vger.kernel.org, David Aguilar <davvid@gmail.com>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with
Date: Fri, 01 Feb 2013 21:17:42 +0100 [thread overview]
Message-ID: <510C22E6.6010500@tu-clausthal.de> (raw)
In-Reply-To: <7va9rnaiz4.fsf@alter.siamese.dyndns.org>
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 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.
>>
>> [1] http://www.mingw.org/wiki/Posix_path_conversion
>
> Sven?
I just mailed a new patch. Thanks to Sebastian for pointing this out!
@Junio: Feel free to optimize the commit message.
--
Best regards,
Sven Strickroth
PGP key id F5A9D4C4 @ any key-server
next prev parent reply other threads:[~2013-02-01 20:33 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-20 11:27 [PATCH] mergetools: Add tortoisegitmerge helper Sven Strickroth
2013-01-21 0:43 ` Junio C Hamano
2013-01-21 8:24 ` Sven Strickroth
2013-01-21 8:26 ` Sven Strickroth
2013-01-24 11:19 ` Sven Strickroth
2013-01-24 19:51 ` Junio C Hamano
2013-01-24 22:07 ` Sven Strickroth
2013-01-24 22:15 ` Junio C Hamano
2013-01-25 6:11 ` David Aguilar
2013-01-25 7:21 ` Junio C Hamano
2013-01-25 7:54 ` David Aguilar
2013-01-25 9:48 ` John Keeping
2013-01-25 9:06 ` [PATCH] mergetools: Enhance tortoisemerge to work with Sven Strickroth
2013-01-25 10:09 ` David Aguilar
2013-01-25 13:07 ` Sven Strickroth
2013-01-25 18:28 ` Junio C Hamano
2013-01-26 0:58 ` Sven Strickroth
2013-01-26 1:14 ` Sven Strickroth
2013-01-26 1:15 ` [PATCH 1/2] mergetools: Added support for TortoiseGitMerge Sven Strickroth
2013-01-26 1:17 ` [PATCH 2/2] mergetools: Make tortoisemerge work with Sven Strickroth
2013-01-26 7:10 ` David Aguilar
2013-01-27 9:14 ` Sven Strickroth
2013-01-27 17:48 ` Junio C Hamano
2013-02-01 19:33 ` [PATCH] mergetools: Enable tortoisemerge to handle filenames with Sven Strickroth
2013-02-01 20:07 ` Sebastian Schuberth
2013-02-01 20:10 ` Sven Strickroth
2013-02-01 20:15 ` Junio C Hamano
2013-02-01 20:17 ` Sven Strickroth [this message]
2013-02-01 20:16 ` [PATCH] mergetools: Enable tortoisemerge to handle filenames with spaces with TortoiseGitMerge Sven Strickroth
2013-02-02 1:59 ` David Aguilar
2013-02-02 2:08 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=510C22E6.6010500@tu-clausthal.de \
--to=sven.strickroth@tu-clausthal.de \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sschuberth@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.