Turn off timestamping after the warning.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7d8e5ec58974130fb045016dea146103eb8b7003..b8b466c06703b0a46404fc0ceb006609deedef01 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2008-05-12  Micah Cowan  <micah@cowan.name>
 
-       * main.c (main): Downgrade "-N with -O" to a warning.
+       * main.c (main): Downgrade "-N with -O" to a warning, and switch
+       it off to avoid confusing messages.
 
 2008-04-30  Micah Cowan  <micah@cowan.name>
 

diff --git a/src/main.c b/src/main.c
index fbdafd2b1544032912baf8c0fee1b5321b9b6425..421a5501b6e34e4795a9a62e779289e42aff1a2f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -903,6 +903,7 @@ will be placed in the single file you specified.\n\n"));
           logprintf (LOG_NOTQUIET, "%s", _("\
 WARNING: timestamping does nothing in combination with -O. See the manual\n\
 for details.\n\n"));
+          opt.timestamping = false;
         }
     }