Comments on: git and Changes.app: take two, the right way to do it http://danimal.org/SenorTaco/2008/02/27/git-and-changesapp-take-two-the-right-way-to-do-it/ rolling through the journey that is life Thu, 28 Aug 2008 03:17:38 +0000 http://wordpress.org/?v=2.6 By: danimal http://danimal.org/SenorTaco/2008/02/27/git-and-changesapp-take-two-the-right-way-to-do-it/#comment-336 danimal Wed, 12 Mar 2008 22:12:14 +0000 http://danimal.org/SenorTaco/2008/02/27/git-and-changesapp-take-two-the-right-way-to-do-it/#comment-336 Lovely. It looks as though WordPress encoded the quotes and dash dash as html entities so a cut and past doesn't work quite right. I suggest going to the <a href="http://wiki.changesapp.com/index.php/SCM_Integration_Scripts#Git_Integration" rel="nofollow">Changes Wiki</a> and getting the code from there. Lovely. It looks as though WordPress encoded the quotes and dash dash as html entities so a cut and past doesn’t work quite right. I suggest going to the Changes Wiki and getting the code from there.

]]> By: Matt http://danimal.org/SenorTaco/2008/02/27/git-and-changesapp-take-two-the-right-way-to-do-it/#comment-335 Matt Wed, 12 Mar 2008 21:56:57 +0000 http://danimal.org/SenorTaco/2008/02/27/git-and-changesapp-take-two-the-right-way-to-do-it/#comment-335 I noticed a couple of typos in the script above: chdiff needs two dashes for its options and bash needs straight quotes: <code> #!/bin/bash [ $# -eq 7 ] && /usr/bin/env chdiff –-wait "$2" "$5" </code> More importantly, though, I'm not having any luck getting this to work with Changes: <code> $ git diff diff --git a/README b/README index a1db73c..98b2cc3 100644 --- a/README +++ b/README @@ -201,3 +201,4 @@ test vendor External libraries that the application depends on. Also includes the plugins subdirectory. This directory is in the load path. +testing $ export GIT_EXTERNAL_DIFF=gitchdiff $ git diff Usage: chdiff (--background) (--wait) chdiff --script Notes: You can use process substitution for either filename1 or filename2. To use STDIN, pass (-) for either or . The --script parameter expects a path to a valid F-Script script. external diff died, stopping at README. $ cat /Users/matt/bin/gitchdiff #!/bin/bash [ $# -eq 7 ] && /usr/bin/env chdiff -€“-wait "$2" "$5" </code> I noticed a couple of typos in the script above: chdiff needs two dashes for its options and bash needs straight quotes:


#!/bin/bash
[ $# -eq 7 ] && /usr/bin/env chdiff –-wait “$2″ “$5″

More importantly, though, I’m not having any luck getting this to work with Changes:


$ git diff
diff --git a/README b/README
index a1db73c..98b2cc3 100644
--- a/README
+++ b/README
@@ -201,3 +201,4 @@ test
vendor
External libraries that the application depends on. Also includes the plugins subdirectory.
This directory is in the load path.
+testing
$ export GIT_EXTERNAL_DIFF=gitchdiff
$ git diff
Usage: chdiff (--background) (--wait)
chdiff --script

Notes: You can use process substitution for either filename1 or filename2.
To use STDIN, pass (-) for either or .
The --script parameter expects a path to a valid F-Script script.
external diff died, stopping at README.

$ cat /Users/matt/bin/gitchdiff

#!/bin/bash
[ $# -eq 7 ] && /usr/bin/env chdiff -€“-wait “$2″ “$5″

]]>