Git 1.7.7 upgrade causes custom merge tools to fail about git-diffall HOT 6 CLOSED

I'm sorry it took so long for me to respond...is this still an issue for you?

I don't experience any problems when running with git v1.7.8 (msysgit on Win7).

from git-diffall.

I just upgraded git-core to 1.7.9 using:

sudo port autoupdate
sudo port upgrade git-core

(Mac OS X 10.7)

Unfortunately the issue is still there, git-diffall stopped working, I went back into git-mergetool--lib and found the same 'return 1' culprit. Changing it to '0' again worked.

from git-diffall.

This appears to be a "feature". When new diff backends are desired, the developer community expects to create a new file in $(git --exec-path)/mergetools/ for it. The default Git install does not include such a file for DeltaWalker. In theory, once the file is created in that directory, you should be able to git config --global diff.tool <filename> and everything should work again.

See this discussion on the Git list.

This change was added to Git in commit bc7a96a8965d on August 18, 2011 by David Aguilar. The first release to include it was v1.7.7.

from git-diffall.

After thinking a bit more, I don't understand it must an error is raised if no tool file is found. It could just attempt to continue using the default file. Can you try this modified version of git-mergetool--lib.sh? If it works, I will submit it as a patch to the Git list and see if they approve.

from git-diffall.

It turns out that the defaults file is broken, so it cannot be used unless it gets patched in git. In the meantime, one way to fix this is to add a deltawalker config file to your $(git --exec-path)/mergetools directory. This was tested with DeltaWalker v1.9.8 and msysgit v1.7.9 on Win7, 64-bit.

This is not a perfect solution, but at least you only need to copy a file into the git directory rather than modifying one of git's files.

An example of the file that worked for me can be found here. This config assumes that the DeltaWalker executable is in your $PATH.

If this same file works for you on Mac, then I may submit it as a patch to the git developers list. I was not able to test this file for merging.

from git-diffall.

Starting with v1.7.10, git will have built-in support for DeltaWalker again.

I submitted a patch to the git developers list to add DeltaWalker support and it has been accepted.

When it is released, you will be able to enable DeltaWalker using the following config changes:

# NOTE: case matters!
git config --global diff.tool deltawalker
git config --global merge.tool deltawalker

from git-diffall.