From: Uwe Kleine-König Date: Wed, 25 Mar 2009 17:21:04 +0000 (+0100) Subject: tg patch: treat all files as ascii X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=29ab4cf73dbaaccb6533f3f0fe1d0b1d484950c5;ds=sidebyside tg patch: treat all files as ascii This fixes patching binary files, for a problem case check out http://bugs.debian.org/521173 . Closes: http://bugs.debian.org/521173 Signed-off-by: Uwe Kleine-König --- diff --git a/tg-patch.sh b/tg-patch.sh index f703a87..7bafdfe 100644 --- a/tg-patch.sh +++ b/tg-patch.sh @@ -57,7 +57,7 @@ git diff --name-only $diff_opts "$base_rev" ${diff_committed_only:+"$name"} -- | fgrep -vx ".topmsg" >"$git_is_stupid" || : # fgrep likes to fail randomly? if [ -s "$git_is_stupid" ]; then cd "$root_dir" - cat "$git_is_stupid" | xargs git diff --patch-with-stat $diff_opts "$base_rev" ${diff_committed_only:+"$name"} -- + cat "$git_is_stupid" | xargs git diff -a --patch-with-stat $diff_opts "$base_rev" ${diff_committed_only:+"$name"} -- else echo "No changes." fi