Using Git + TortoiseMerge, failing to load file into TortoiseMerge because of space in path name

Question

I'm trying to use Tortoise's DiffMerge tool to resolve a git merge conflict.

I've got the following my my .gitconfig:

[diff]
  tool = tortoisediff
[difftool]
  prompt = false
[merge]
  tool = tortoisemerge
[mergetool]
  prompt = false
  keepBackup = false
[difftool "tortoisediff"]
  cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -mine:"$REMOTE" -base:"$LOCAL"
[mergetool "tortoisemerge"]
  cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -base:"$BASE" -theirs:"$REMOTE" -mine:"$LOCAL" -merged:"$MERGED"

TortoiseGit opens fine, but when I try and work with my file I get an error:

enter image description here

The full path to the location looks like:

C:\Users\Streamus\Documents\GitHub\StreamusServer\Streamus.Tests\Controller Tests\ErrorControllerTest.cs

Is it possible to support this path using Git and TortoiseMerge? As far as I am aware I am properly escaping the path..

Shouldn't it be `"\"c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe\""`? — Bleeding Fingers, Mar 06 '14 at 18:22
Well, it's successfully finding TortoiseGitMerge so I'm not sure it's that part that's the issue? I think it's dealing with the remote/base/local stuff. — Sean Anderson, Mar 06 '14 at 18:23
I think it should be something like: [`... -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"`](http://stackoverflow.com/q/5190188/1309352) — Bleeding Fingers, Mar 06 '14 at 18:34
nope! Doesn't work either. Suspect has to do with the new version of tortoise. — Sean Anderson, Mar 06 '14 at 18:51
Yeah I ended up using a different merge tool and now we're OK :) — Sean Anderson, Mar 06 '14 at 20:03
Was this a bug in TortoiseGitMerge in the end? @LucasHolt, I've never heard of anyone using WinMerge to merge. Despite it's name, it's really only useful as a diff tool. — johnb003, Mar 12 '14 at 02:06

score 1 · Answer 1 · answered Jan 19 '15 at 01:36

create a CMD file which will launch TortoiseMerge:

TortoiseMerge.exe -base:%1 -mine:%2 -theirs:%3 -merged:%4

And set up your mergetool in .gitconfig:

[merge]
    tool = mytool
[mergetool "mytool"]
    cmd = cmd /C tortoiseMerge-git.cmd "$BASE" "$LOCAL" "$REMOTE" "$MERGED"

The background:

Git internally uses a Windows version of sh. If it launches a command it will handle spaces in file names correctly. Arguments containing spaces are wrapped in quotes if necessary. But I haven't found a way to force having a literal quote halfway an argument.

TortoiseMerge expects arguments to look like this: -mine:"some path/some file.txt". If -mine is also enclosed in the quotes it won't work.

So we can create a batch file which just sticks the -mine: in front of the path, but there we encounter another bug: if you use a batch file as command, then the CMD file gets parsed by sh instead of cmd, so we explicitly invoke cmd with the /C switch to execute a command.

Note also that in the batch file, %1 etc. will have quotes around them, so don't add another set of quotes in the batch file.

Using Git + TortoiseMerge, failing to load file into TortoiseMerge because of space in path name

1 Answers1

Linked