From 29ab4cf73dbaaccb6533f3f0fe1d0b1d484950c5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Wed, 25 Mar 2009 18:21:04 +0100 Subject: [PATCH] tg patch: treat all files as ascii MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- tg-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.30.2