From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 9 Apr 2015 16:31:31 +0000 (-0700)
Subject: Merge from gnulib
X-Git-Tag: emacs-25.0.90~2518
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4e642454bdc7d4bbdf869655d61843888ceee7af;p=emacs.git

Merge from gnulib

* build-aux/gitlog-to-changelog: Update from gnulib, incorporating:
2015-04-09 gitlog-to-changelog: port to MS-Windows
---

diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 4fa4f29702a..3f4b06a4df1 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2015-03-21 01:01'; # UTC
+my $VERSION = '2015-04-09 16:03'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -328,7 +328,7 @@ sub git_dir_option($)
                   ? '  (tiny change)' : '');
 
       my $date_line = sprintf "%s  %s$tiny\n",
-        strftime ("%F", localtime ($1)), $2;
+        strftime ("%Y-%m-%d", localtime ($1)), $2;
 
       my @coauthors = grep /^Co-authored-by:.*$/, @line;
       # Omit meta-data lines we've already interpreted.