From d34dd0d4b58a252fc679c10d9d541b032dae4d06 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Thu, 26 Jul 2007 11:55:31 +0000 Subject: - quilt diff: don't colorize the output when the --diff=... option is used (allows diff utilities to use terminal IO). --- quilt.changes | 6 ++++++ quilt/diff.in | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/quilt.changes b/quilt.changes index 2f617d0..3ecd1c2 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 26 13:53:09 CEST 2007 - agruen@suse.de + +- quilt diff: don't colorize the output when the --diff=... option + is used (allows diff utilities to use terminal IO). + ------------------------------------------------------------------- Tue Jun 5 17:37:43 CEST 2007 - agruen@suse.de diff --git a/quilt/diff.in b/quilt/diff.in index 8e0efca..8435024 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -118,7 +118,7 @@ do_diff() true fi else - diff_file $file $old_file $new_file + diff_file $file $old_file $new_file | colorize fi } @@ -338,8 +338,7 @@ do files_were_shadowed=1 fi - do_diff "$file" "$old_file" "$new_file" \ - | colorize + do_diff "$file" "$old_file" "$new_file" if [ $? -ne 0 ] then -- cgit