#
#
# patch "NEWS"
#  from [868462b935af78cc11137cd49624d8ac0e746c9c]
#    to [93b544aac93014b1d06be2626e7be2bb03bcb724]
# 
# patch "cmd_ws_commit.cc"
#  from [35a83f88dea4ecf6c29b2b7d0843cb7a9f55ac9f]
#    to [b06703abd2d59814b4636f50029dfb3d691e4ebe]
# 
# patch "std_hooks.lua"
#  from [d184cda6a7728e742d685db1b88995c97c46b73d]
#    to [f2fb2d3bcad08213e0dd713bb07abd235a1d68fe]
#
============================================================
--- NEWS	868462b935af78cc11137cd49624d8ac0e746c9c
+++ NEWS	93b544aac93014b1d06be2626e7be2bb03bcb724
@@ -4,6 +4,9 @@ Xxx Xxx 99 99:99:99 UTC 2010
 
         Changes
 
+        - On Win32 native, '--no-format-dates' is the default for
+          'commit', since dates are not parseable on Win32 native.
+
         - 'automate genkey' is renamed to 'automate generate_key'
 
         - Selectors are much more powerful now, and the characters '(',
============================================================
--- std_hooks.lua	d184cda6a7728e742d685db1b88995c97c46b73d
+++ std_hooks.lua	f2fb2d3bcad08213e0dd713bb07abd235a1d68fe
@@ -1248,14 +1248,6 @@ function get_default_command_options(com
 
 function get_default_command_options(command)
     local default_args = {}
-    local ostype = get_ostype()
-
-    --  Dates are never parseable on Win32 (see win32/parse_date.cc),
-    --  so don't warn about that, just use the default format.
-    if (command[1] == "commit") and string.find(ostype, "Windows") then
-        table.insert(default_args, "--no-format-dates")
-    end
-
     return default_args
 end
 
============================================================
--- cmd_ws_commit.cc	35a83f88dea4ecf6c29b2b7d0843cb7a9f55ac9f
+++ cmd_ws_commit.cc	b06703abd2d59814b4636f50029dfb3d691e4ebe
@@ -1819,6 +1819,17 @@ void perform_commit(app_state & app,
   }
 }
 
+CMD_PRESET_OPTIONS(commit)
+{
+  // Dates are never parseable on Win32 (see win32/parse_date.cc),
+  // so don't warn about that, just use the default format.
+#ifdef WIN32
+  opts.no_format_dates = true;
+#else
+  opts.no_format_dates = false;
+#endif
+}
+
 CMD(commit, "commit", "ci", CMD_REF(workspace), N_("[PATH]..."),
     N_("Commits workspace changes to the database"),
     "",