Alright, here's a patch that should fix it.  Let me know if it does, and
I'll make a new release.

Thanks,

Josef 'Jeff' Sipek.

-- 
Si hoc legere scis nimium eruditionis habes.
diff --git a/guilt-diff b/guilt-diff
index 627eb16..bbb6089 100755
--- a/guilt-diff
+++ b/guilt-diff
@@ -23,4 +23,4 @@ PREV=HEAD^
 [ -z "`get_top`" ] && PREV=
 [ ! -z "$working_tree" ] && PREV=
 
-git diff $PREV -- "$@"
+git diff --binary $PREV -- "$@"
diff --git a/guilt-import-commit b/guilt-import-commit
index 30d0962..fafe50d 100755
--- a/guilt-import-commit
+++ b/guilt-import-commit
@@ -40,7 +40,7 @@ for rev in `git rev-list $rhash`; do
 	(
 		do_make_header $rev
 		echo ""
-		git diff $rev^..$rev
+		git diff --binary $rev^..$rev
 	) > $GUILT_DIR/$branch/$fname
 
 	# FIXME: grab the GIT_AUTHOR_DATE from the commit object and set the
diff --git a/guilt-new b/guilt-new
index e539b5b..5f1913c 100755
--- a/guilt-new
+++ b/guilt-new
@@ -82,7 +82,7 @@ mkdir_dir=`dirname "$GUILT_DIR/$branch/$patch"`
 if [ ! -z "$force" ]; then
 	(
 		cd_to_toplevel
-		git diff HEAD >> "$GUILT_DIR/$branch/$patch"
+		git diff --binary HEAD >> "$GUILT_DIR/$branch/$patch"
 	)
 fi
 

Reply via email to