On Mon, Feb 24, 2014 at 8:44 AM, Paul Lotz <pl...@lsst.org> wrote:
> 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

Hmm. That's interesting.

The next test: replace "echo" with "cat".

Are the contents of both files printed?

If so, then the next thing to try is running:

LVCompare.exe [same paths printed by echo]

and then seeing if it does the right thing.

Could it be that LVCompare.exe is getting tripped up by the forward slashes?

I'm not familiar enough with how msysgit mangles paths before
launching programs. It may be that the C:/foo/bar/baz path is getting
manged (that's my current guess), but I really don't know.

Another tip I've read online is that launching git via "cmd.exe" may
avoid the path mangling. Sorry I'm not more helpful in this area.

Another workaround you can do is to place a shell script wrapper
around LVCompare.exe that replaces C:\/ with / and then launches the
real LVCompare.exe; that's a workaround, but it could work.

I hope that helps shed some light on what may be going on.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to