From: "P. Duijst" <p.duijst@gmail.com>
To: David Aguilar <davvid@gmail.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: Error after calling git difftool -d with
Date: Mon, 5 Dec 2016 08:58:00 +0100 [thread overview]
Message-ID: <c0c8c333-adfa-ad58-f1ec-7239a3a16528@gmail.com> (raw)
In-Reply-To: <20161205051510.itftw4hyzkv6nnxn@gmail.com>
On 12/5/2016 06:15, David Aguilar wrote:
> On Fri, Dec 02, 2016 at 05:05:06PM +0100, Johannes Schindelin wrote:
>> Hi Peter,
>>
>> On Fri, 2 Dec 2016, P. Duijst wrote:
>>
>>> Incase filenames are used with a quote ' or a bracket [ (and maybe some more
>>> characters), git "diff" and "difftool -y" works fine, but git *difftool **-d*
>>> gives the next error message:
>>>
>>> peter@scm_ws_10 MINGW64 /d/Dev/test (master)
>>> $ git diff
>>> diff --git a/Test ''inch.txt b/Test ''inch.txt
>>> index dbff793..41f3257 100644
>>> --- a/Test ''inch.txt
>>> +++ b/Test ''inch.txt
>>> @@ -1 +1,3 @@
>>> +
>>> +ddd
>>> Test error in simple repository
>>> warning: LF will be replaced by CRLF in Test ''inch.txt.
>>> The file will have its original line endings in your working directory.
>>>
>>> peter@scm_ws_10 MINGW64 /d/Dev/test (master)
>>> *$ git difftool -d*
>>> *fatal: Cannot open '/d/Dev/test//Test ''inch.txt': No such file or
>>> directory*
>>> *hash-object /d/Dev/test//Test ''inch.txt: command returned error: 128*
>>>
>>> peter@scm_ws_10 MINGW64 /d/Dev/test (master)
>>> $
>>>
>>>
>>> This issue is inside V2.10.x and V2.11.0.
>>> V2.9.0 is working correctly...
>> You say v2.11.0, but did you also try the new, experimental builtin
>> difftool? You can test without reinstalling:
>>
>> git -c difftool.useBuiltin=true difftool -d ...
> FWIW, I verified that this problem does not manifest itself on
> Linux, using the current scripted difftool.
>
> Peter, what actual diff tool are you using?
>
> Since these filenames work fine with "difftool -d" on Linux, it
> suggests that this is either a tool-specific issue, or an issue
> related to unix-to-windows path translation.
Hi all,
@Johannes: "git -c difftool.useBuiltin=true difftool -d" works OK :-),
beyond compare is launching with the diff's displayed
@David: I am using Beyond Compare V4.1.9
Best regards,
Peter
next prev parent reply other threads:[~2016-12-05 7:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 12:15 Error after calling git difftool -d with P. Duijst
2016-12-02 16:05 ` Johannes Schindelin
2016-12-05 5:15 ` David Aguilar
2016-12-05 7:58 ` P. Duijst [this message]
2016-12-05 10:56 ` Johannes Schindelin
2016-12-09 9:47 ` David Aguilar
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=c0c8c333-adfa-ad58-f1ec-7239a3a16528@gmail.com \
--to=p.duijst@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).