Problem setting up git diff
I tried to set up Changes.app with git using the instructions on the Changes Wiki[1] and have a script set up as described there:
I have also set the git diff.external using git config --global to use that script but whenever I run "git diff" I get:
I have chdiff installed through the Changes menu and launching Changes through chdiff works without problems. I am using git v1.6.3.3 and the latest Changes app.
Any ideas?
[1] http://wiki.changesapp.com/index.php/...
#!/bin/sh
[ $# -eq 7 ] && /usr/bin/env chdiff --wait "$2" "$5"
I have also set the git diff.external using git config --global to use that script but whenever I run "git diff" I get:
external diff died, stopping at [file]
I have chdiff installed through the Changes menu and launching Changes through chdiff works without problems. I am using git v1.6.3.3 and the latest Changes app.
Any ideas?
[1] http://wiki.changesapp.com/index.php/...
2
people have this problem
I have this problem, too!
Tell me when someone solves it.
The more people who report this problem, the more it gets noticed.
The more people who report this problem, the more it gets noticed.
-
Inappropriate?Managed to get it working with git difftool instead of git diff using info on stack overflow[1]. My git config now looks like this and no external script is needed:
[diff]
tool = chdiff
[difftool "chdiff"]
cmd = chdiff \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[1] http://stackoverflow.com/questions/25...
I’m happy
2 people say
this solves the problem
-
Inappropriate?Were you perchance using GNU Screen? I'm unable to invoke chdiff from a shell within Screen, but outside of Screen it works fine.
Loading Profile...



