diff options
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/annotate.in | 2 | ||||
| -rw-r--r-- | quilt/diff.in | 2 | ||||
| -rw-r--r-- | quilt/scripts/dependency-graph.in | 4 | ||||
| -rw-r--r-- | quilt/scripts/patchfns.in | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/quilt.changes b/quilt.changes index a3e05bf..0dd099c 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 23 01:08:16 CET 2006 - agruen@suse.de + +- Remove unnecessary uses of diff's -N option. + +------------------------------------------------------------------- Mon Jan 23 00:59:10 CET 2006 - agruen@suse.de - Don't include any object files in LIBOBJS that we don't have. diff --git a/quilt/annotate.in b/quilt/annotate.in index 20026c7..666817e 100644 --- a/quilt/annotate.in +++ b/quilt/annotate.in @@ -48,7 +48,7 @@ annotation_for() local old_file=$1 new_file=$2 annotation=$3 [ -s "$old_file" ] || old_file=/dev/null [ -s "$new_file" ] || new_file=/dev/null - diff -Ne "$old_file" "$new_file" \ + diff -e "$old_file" "$new_file" \ | perl -e ' while (<>) { if (/^\d+(?:,\d+)?[ac]$/) { diff --git a/quilt/diff.in b/quilt/diff.in index f22cdb4..ebdb7a0 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -116,7 +116,7 @@ do_diff() then [ -s "$old_file" ] || old_file=/dev/null [ -s "$new_file" ] || new_file=/dev/null - if ! diff -qN $old_file $new_file >/dev/null + if ! diff -q $old_file $new_file >/dev/null then export LANG=$ORIGINAL_LANG $opt_diff $old_file $new_file diff --git a/quilt/scripts/dependency-graph.in b/quilt/scripts/dependency-graph.in index a853c10..9ee6da6 100644 --- a/quilt/scripts/dependency-graph.in +++ b/quilt/scripts/dependency-graph.in @@ -165,7 +165,7 @@ sub compute_ranges($$) { $file2 = $file; } - #print STDERR "diff -NU$lines \"$file1\" \"$file2\"\n"; + #print STDERR "diff -U$lines \"$file1\" \"$file2\"\n"; if (-z $file1) { $file1="/dev/null"; return [[], []] @@ -174,7 +174,7 @@ sub compute_ranges($$) { $file2="/dev/null" if (-z $file2); } - my $fd = new FileHandle("diff -NU$lines \"$file1\" \"$file2\" |"); + my $fd = new FileHandle("diff -U$lines \"$file1\" \"$file2\" |"); my $ranges = ranges($fd); $fd->close(); return $ranges; diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 9edd81d..ea886fb 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -685,7 +685,7 @@ diff_file() -r "$new_file") fi - diff -N $QUILT_DIFF_OPTS $old_file $new_file \ + diff $QUILT_DIFF_OPTS $old_file $new_file \ --label "$old_hdr$old_date" --label "$new_hdr$new_date" \ | if read line then |