diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2003-03-16 11:12:01 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2003-03-16 11:12:01 +0000 |
commit | 83deaaef152fca6970add7b83910d3c27752f3d8 (patch) | |
tree | dac8e17ef8eec57f58c6264b4f7a9f55effdd128 /scripts/patchfns.in | |
parent | 9dfbce9e3bbe1a3541cd955d5157d95d5c093da3 (diff) | |
download | quilt-83deaaef152fca6970add7b83910d3c27752f3d8.tar.gz |
The patch filename was appended to the directory/file name in patches
generated, like dir~patch/file and file~patch. This is unnecessary,
and at most irritationg when patches are renamed. Use dir.orig/file
and file.orig instead.
Also for better readability add a separator line below `Index:',
like in diffs CVS generates.
Diffstat (limited to 'scripts/patchfns.in')
-rw-r--r-- | scripts/patchfns.in | 7 |
1 files changed, 4 insertions, 3 deletions
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 |