mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00
Code Issues Releases Activity

Use diff -p both when first creating and when updating a patch.

Browse Source 
Previously a patch created by update-patches would be changed again
by the next update-patches run.
This commit is contained in:
Christian Weisgerber 2009-02-15 16:16:33 +00:00
parent 43b187a5f8
commit 1895bc9e69
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=228415
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/scripts/update-patches
View File

@ -47,7 +47,7 @@ do
# found it, splice before diff part with diff
esc=`echo $file | sed -e 's,/,\\\\/,g'`
{ sed -e "/^--- $esc.orig/,\$ d" <$i
(cd $PATCH_WRKSRC && diff ${DIFF_ARGS} -u $file.orig $file) } >$i.new
(cd $PATCH_WRKSRC && diff -p ${DIFF_ARGS} -u $file.orig $file) } >$i.new
# did it change ? mark it as changed
if diff ${DIFF_ARGS} -u --ignore-matching-lines="^--- $file.orig .*" \
--ignore-matching-lines="^+++ $file .*" $i $i.new 1>&2