diff options
| author | naddy <naddy@FreeBSD.org> | 2009-02-16 00:16:33 +0800 |
|---|---|---|
| committer | naddy <naddy@FreeBSD.org> | 2009-02-16 00:16:33 +0800 |
| commit | c139468f4156c59c216c58d5f201dddbec9238f2 (patch) | |
| tree | 464768b054e7b5e94f0561e5707e33935904edb1 /Tools | |
| parent | 25efbb4476d235ac9e92f041ff0ab218d31097aa (diff) | |
| download | freebsd-ports-gnome-c139468f4156c59c216c58d5f201dddbec9238f2.tar.gz freebsd-ports-gnome-c139468f4156c59c216c58d5f201dddbec9238f2.tar.zst freebsd-ports-gnome-c139468f4156c59c216c58d5f201dddbec9238f2.zip | |
Use diff -p both when first creating and when updating a patch.
Previously a patch created by update-patches would be changed again
by the next update-patches run.
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/scripts/update-patches | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/scripts/update-patches b/Tools/scripts/update-patches index 51e4b4fc5571..137eadb750d1 100755 --- a/Tools/scripts/update-patches +++ b/Tools/scripts/update-patches @@ -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 |