aboutsummaryrefslogtreecommitdiffstats
path: root/build/build_helper.php
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-06-10 00:48:24 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-06-10 14:15:10 +0200
commitcdf580ee376c2b1b75a102e326c9d41a679d2e89 (patch)
treebc26f19366f621f1195da02b60e30faf697f4a73 /build/build_helper.php
parent88d16b47a408640a4e46096b3633ca05a791a8af (diff)
downloadforums-cdf580ee376c2b1b75a102e326c9d41a679d2e89.tar
forums-cdf580ee376c2b1b75a102e326c9d41a679d2e89.tar.gz
forums-cdf580ee376c2b1b75a102e326c9d41a679d2e89.tar.bz2
forums-cdf580ee376c2b1b75a102e326c9d41a679d2e89.tar.xz
forums-cdf580ee376c2b1b75a102e326c9d41a679d2e89.zip
[ticket/13823] Change diff options while packaging to not ignore all whitespaces
Removed: -w, --ignore-all-space Ignore white space when comparing lines. Added: -Z, --ignore-trailing-space Ignore white space at line end. -b, --ignore-space-change Ignore changes in the amount of white space. PHPBB3-13823
Diffstat (limited to 'build/build_helper.php')
-rw-r--r--build/build_helper.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/build_helper.php b/build/build_helper.php
index d6169b913b..c8b9ea2bca 100644
--- a/build/build_helper.php
+++ b/build/build_helper.php
@@ -18,11 +18,11 @@ class build_package
// -r - compare recursive
// -N - Treat missing files as empty
// -E - Ignore tab expansions
- // not used: -b - Ignore space changes.
- // -w - Ignore all whitespace
+ // -Z - Ignore white space at line end.
+ // -b - Ignore changes in the amount of white space.
// -B - Ignore blank lines
// -d - Try to find smaller set of changes
- var $diff_options = '-crNEBwd';
+ var $diff_options = '-crNEBZbd';
var $diff_options_long = '-x images -crNEB'; // -x fonts -x imageset //imageset not used here, because it includes the imageset.cfg file. ;)
var $verbose = false;