Re: Error after calling git difftool -d with

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]