diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2004-01-26 17:30:59 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2004-01-26 17:30:59 +0000 |
| commit | c8f14351198fc69541f17aae56937b79c8d9a29c (patch) | |
| tree | 07b26f6d5dc11f7dee0919f5629dec015c209a4f /scripts/patchfns.in | |
| parent | ac7ee7ea6b272a50f1a8b77b0fc9a70f435e8f67 (diff) | |
| download | quilt-c8f14351198fc69541f17aae56937b79c8d9a29c.tar.gz | |
- Add QUILT_NO_DIFF_TIMESTAMPS option in .quiltrc.
GNU patch.
- Fix help for `quilt diff'.
- Update TODO.
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 2ddf7ac..a715033 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -425,9 +425,10 @@ touched_by_patch() fix_diff_header() { - local from=$1 to=$2 - @SED@ -e 's/^--- [^ '$'\t'']*/--- '"$(quote_bre $from)"'/' \ - -e 's/^+++ [^ '$'\t'']*/+++ '"$(quote_bre $to)"'/' + local from=$1 to=$2 z + [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] && z='.*' + @SED@ -e 's/^--- [^ '$'\t'']*'$z'/--- '"$(quote_bre $from)"'/' \ + -e 's/^+++ [^ '$'\t'']*'$z'/+++ '"$(quote_bre $to)"'/' } diff_file() |