[Quilt-dev] QUILT_NO_DIFF_TIMESTAMPS vs. QUILT_DIFF_NO_TIMESTAMPS

[Joe Green]

In the current source tree, I found that some places use 
QUILT_NO_DIFF_TIMESTAMPS and some use QUILT_DIFF_NO_TIMESTAMPS.  I don't 
know which is preferred, but QUILT_DIFF_NO_TIMESTAMPS was more common, 
so I changed them all to that (see attached patch).

I also found that with the version of diff I have, the use of --label 
also disables timestamps.  --label appears to be used by default now, so 
timestamps are effectively always disabled.  I don't know if this 
behavior is specific to the version of diff I have or not (diffutils 2.8.1).

--
Joe Green <address@hidden>
MontaVista Software, Inc.

Source: MontaVista Software, Inc
Type: Defect Fix
Description:
    Code uses QUILT_NO_DIFF_TIMESTAMPS in some places, QUILT_DIFF_NO_TIMESTAMPS
    in others.  Fixed to use QUILT_DIFF_NO_TIMESTAMPS everywhere.

Index: quilt-0.34/doc/quilt.1.in
===================================================================
--- quilt-0.34.orig/doc/quilt.1.in
+++ quilt-0.34/doc/quilt.1.in
@@ -134,7 +134,7 @@
 patches. A useful setting for C source code is "-p", which causes GNU diff
 to show in the resulting patch which function a change is in.
     
-.IP QUILT_NO_DIFF_TIMESTAMPS 4 
+.IP QUILT_DIFF_NO_TIMESTAMPS 4 
 
 When set to "yes", the quilt diff and quilt refresh commands will not
 include file timestamps in patches.
Index: quilt-0.34/doc/sample.quiltrc
===================================================================
--- quilt-0.34.orig/doc/sample.quiltrc
+++ quilt-0.34/doc/sample.quiltrc
@@ -9,7 +9,7 @@
 #QUILT_PATCHES=patches
 
 # Define this to generate diffs without timestamps.
-#QUILT_NO_DIFF_TIMESTAMPS=yes
+#QUILT_DIFF_NO_TIMESTAMPS=yes
 
 # Create backup when refreshing patches.
 QUILT_BACKUP=yes
Index: quilt-0.34/scripts/patchfns.in
===================================================================
--- quilt-0.34.orig/scripts/patchfns.in
+++ quilt-0.34/scripts/patchfns.in
@@ -491,7 +491,7 @@
 fix_diff_header()
 {
        local from=$1 to=$2 z
-       if [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ]
+       if [ -n "$QUILT_DIFF_NO_TIMESTAMPS" ]
        then
                sed -e 's:^\(\(---\|+++\) .*\)\t.*:\1:'
        else
Index: quilt-0.34/test/test.quiltrc
===================================================================
--- quilt-0.34.orig/test/test.quiltrc
+++ quilt-0.34/test/test.quiltrc
@@ -1,2 +1,2 @@
 # Define this to generate diffs without timestamps.
-QUILT_NO_DIFF_TIMESTAMPS=yes
+QUILT_DIFF_NO_TIMESTAMPS=yes