diff options
| -rw-r--r-- | quilt/diff.in | 14 | ||||
| -rw-r--r-- | quilt/refresh.in | 2 | ||||
| -rw-r--r-- | scripts/patchfns.in | 7 |
3 files changed, 9 insertions, 14 deletions
diff --git a/quilt/diff.in b/quilt/diff.in index dbe82cb..c904bb0 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -58,7 +58,7 @@ included. do_diff() { - local file=$1 suffix=$2 old_file=$3 new_file=$4 + local file=$1 old_file=$2 new_file=$3 if [ -n "$opt_reverse" ] then @@ -75,7 +75,7 @@ do_diff() true fi else - diff_file $file $suffix $old_file $new_file + diff_file $file $old_file $new_file fi } @@ -281,16 +281,10 @@ do if [ -z "$opt_relative" ] then - if [ -z "$opt_combine" ] - then - suffix="~${last_patch//\//_}" - else - suffix=".orig" - fi old_file=$(backup_file_name $first_patch $file) - do_diff $file $suffix $old_file $new_file + do_diff $file $old_file $new_file else - do_diff $file ".orig" "$workdir/$file" $new_file + do_diff $file "$workdir/$file" $new_file fi if [ $? -ne 0 ] diff --git a/quilt/refresh.in b/quilt/refresh.in index 09eb9fe..25fca13 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -139,7 +139,7 @@ do new_file=$(backup_file_name $next_patch $file) files_were_shadowed=1 fi - if ! diff_file $file "~${patch//\//_}" $old_file $new_file >> $tmpfile + if ! diff_file $file $old_file $new_file >> $tmpfile then echo $"Diff failed, aborting." >&2 die 1 diff --git a/scripts/patchfns.in b/scripts/patchfns.in index dd8b821..b0b13aa 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -529,7 +529,7 @@ fix_diff_header() diff_file() { - local file=$1 suffix=$2 old_file=$3 new_file=$4 + local file=$1 old_file=$2 new_file=$3 local old_hdr new_hdr line if [ ! -e "$old_file" -a ! -e "$new_file" ] @@ -538,11 +538,11 @@ diff_file() fi if [ $opt_strip_level -eq 0 ] then - old_hdr=$file$suffix + old_hdr=$file.orig new_hdr=$file else local dir=$(basename $PWD) - old_hdr=$dir$suffix/$file + old_hdr=$dir.orig/$file new_hdr=$dir/$file fi @@ -550,6 +550,7 @@ diff_file() if read line then echo "Index: $new_hdr" + echo "===================================================================" (echo "$line" ; cat) \ | fix_diff_header $old_hdr $new_hdr fi |