git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Paul Lotz" <plotz@lsst.org>
To: "'David Aguilar'" <davvid@gmail.com>
Cc: <git@vger.kernel.org>
Subject: RE: difftool sends malformed path to exernal tool on Windows
Date: Mon, 24 Feb 2014 09:44:23 -0700	[thread overview]
Message-ID: <000801cf317f$ac1be2b0$0453a810$@lsst.org> (raw)
In-Reply-To: <20140221103821.GA21414@gmail.com>

David,

Thanks for the helpful reply.

As you suggested, I modified the .gitconfig file to have:
[difftool "test"]
	cmd = echo \"$LOCAL\" \"$REMOTE\"

and ran
$ git difftool -t test

An example of the the resulting console output is:
C:/Users/Paul/AppData/Local/Temp/I8L2Bc_WriteTestParameters.vi Commands/StartAutomatedTest/WriteTestParameters.vi

Paul

-----Original Message-----
From: David Aguilar [mailto:davvid@gmail.com] 
Sent: Friday, February 21, 2014 3:38 AM
To: Paul Lotz
Cc: git@vger.kernel.org
Subject: Re: difftool sends malformed path to exernal tool on Windows

On Mon, Feb 17, 2014 at 03:14:01PM -0700, Paul Lotz wrote:
> From the Git Bash command line, I enter $ git difftool
> 
> and type ‘y’ when the file I want to difference appears.  Git 
> correctly calls the external diff tool (LVCompare.exe), but the path 
> for the remote file Git passes to that tool is malformed (e.g., 
> C:\/Users/Paul/AppData/Local/Temp/QCpqLa_calcLoadCellExcitation.vi).
> Obviously the \/ (backslash forwardslash) combination is incorrect.

If this is the case then difftool is not the only one with this problem.

We use the GIT_EXTERNAL_DIFF mechanism to run difftool under "git diff", so it may be that the paths are mangled by "git diff" itself.
I don't really know enough about msysgit to know for sure, though.

What do you see if you create a dummy tool which just does "echo"?

[difftool "test"]
	cmd = echo \"$LOCAL\" \"$REMOTE\"

Then run:

$ git difftool -t test

> For the record, I have successfully made calls to LVCompare.exe 
> manually from a Windows command prompt directly (without Git).
> 
> The relevant portion of the .gitconfig file is:
> [diff]
>      tool = "LVCompare"
> [difftool "LVCompare"]
>      cmd = 'C:/Program Files (x86)/National Instruments/Shared/LabVIEW 
> Compare/LVCompare.exe' \"$LOCAL\"  \"$REMOTE\"
> 
> 
> For the record, the operating system is Windows 8.1.

Do any msysgit folks know whether GIT_EXTERNAL_DIFF is a known issue?
--
David

  reply	other threads:[~2014-02-24 16:44 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-17 22:14 difftool sends malformed path to exernal tool on Windows Paul Lotz
2014-02-21 10:38 ` David Aguilar
2014-02-24 16:44   ` Paul Lotz [this message]
2014-03-03  0:35     ` David Aguilar
2014-03-03 23:24       ` Paul Lotz
2014-03-05  8:25         ` David Aguilar
2014-03-05 22:28           ` Paul Lotz
2014-03-07 16:07           ` Paul Lotz
2014-03-16  7:27             ` David Aguilar
2014-02-28 15:56   ` Paul Lotz

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='000801cf317f$ac1be2b0$0453a810$@lsst.org' \
    --to=plotz@lsst.org \
    --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).