diff options
| -rw-r--r-- | doc/quilt.1.in | 7 | ||||
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt.quiltrc | 2 | ||||
| -rw-r--r-- | quilt/refresh.in | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/doc/quilt.1.in b/doc/quilt.1.in index 582485c..f68d27a 100644 --- a/doc/quilt.1.in +++ b/doc/quilt.1.in @@ -144,6 +144,13 @@ patches. For example, some versions of GNU patch support the "--unified-reject-files" option for generating reject files in unified diff style. +.IP QUILT_DIFFSTAT_OPTS 4 + +Additional options that quilt shall pass to diffstat when generating +patch statistics. For example, "-f0" can be used for an alternative output +format. Recent versions of diffstat also support alternative rounding +methods ("-r1", "-r2"). + .IP QUILT_PATCHES 4 The location of patch files, defaulting to "patches". diff --git a/quilt.changes b/quilt.changes index d13c97c..5baf95f 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Sep 16 18:49:05 CEST 2005 - khali@linux-fr.org + +- Make it possible to pass arbitrary options to diffstat, by + defining a QUILT_DIFFSTAT_OPTS variable in ~/.quiltrc. +- Update documentation and sample configuration file accordingly. + +------------------------------------------------------------------- Thu Sep 15 23:35:44 CEST 2005 - agruen@suse.de - Fix off-by-one error: it's not a good idea to edit $x instead diff --git a/quilt.quiltrc b/quilt.quiltrc index 19682b0..cc0a352 100644 --- a/quilt.quiltrc +++ b/quilt.quiltrc @@ -4,6 +4,8 @@ QUILT_DIFF_OPTS="--show-c-function" # Options passed to GNU patch when applying patches #QUILT_PATCH_OPTS="--ignore-whitespace" +# Options passed to diffstat when generating patch statistics +#QUILT_DIFFSTAT_OPTS="-f0" # Options to pass to commands (QUILT_${COMMAND}_ARGS) QUILT_PUSH_ARGS="--color=auto" diff --git a/quilt/refresh.in b/quilt/refresh.in index 9fcf3f0..70aa6cd 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -256,7 +256,7 @@ tmp_result=$(gen_tempfile) || die 1 if [ -n "$opt_diffstat" ] then - diffstat="$(@DIFFSTAT@ -p$opt_strip_level $tmp_patch)" || die 1 + diffstat="$(@DIFFSTAT@ $QUILT_DIFFSTAT_OPTS -p$opt_strip_level $tmp_patch)" || die 1 @AWK@ ' function print_diffstat(arr, i) { split(diffstat, arr, "\n") |