aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-04-09 09:31:31 -0700
committerPaul Eggert2015-04-09 09:31:59 -0700
commit4e642454bdc7d4bbdf869655d61843888ceee7af (patch)
treed54c214ed88bcc0f6615c82010729f7a63df7b3c
parent62e75060813370b825cda4720253ba31ffada7e3 (diff)
downloademacs-4e642454bdc7d4bbdf869655d61843888ceee7af.tar.gz
emacs-4e642454bdc7d4bbdf869655d61843888ceee7af.zip
Merge from gnulib
* build-aux/gitlog-to-changelog: Update from gnulib, incorporating: 2015-04-09 gitlog-to-changelog: port to MS-Windows
-rwxr-xr-xbuild-aux/gitlog-to-changelog4
1 files changed, 2 insertions, 2 deletions
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+"$@"}'
3 if 0; 3 if 0;
4# Convert git log output to ChangeLog format. 4# Convert git log output to ChangeLog format.
5 5
6my $VERSION = '2015-03-21 01:01'; # UTC 6my $VERSION = '2015-04-09 16:03'; # UTC
7# The definition above must lie within the first 8 lines in order 7# The definition above must lie within the first 8 lines in order
8# for the Emacs time-stamp write hook (at end) to update it. 8# for the Emacs time-stamp write hook (at end) to update it.
9# If you change this file with Emacs, please let the write hook 9# If you change this file with Emacs, please let the write hook
@@ -328,7 +328,7 @@ sub git_dir_option($)
328 ? ' (tiny change)' : ''); 328 ? ' (tiny change)' : '');
329 329
330 my $date_line = sprintf "%s %s$tiny\n", 330 my $date_line = sprintf "%s %s$tiny\n",
331 strftime ("%F", localtime ($1)), $2; 331 strftime ("%Y-%m-%d", localtime ($1)), $2;
332 332
333 my @coauthors = grep /^Co-authored-by:.*$/, @line; 333 my @coauthors = grep /^Co-authored-by:.*$/, @line;
334 # Omit meta-data lines we've already interpreted. 334 # Omit meta-data lines we've already interpreted.