From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
To: git@vger.kernel.org
Cc: Ben Walton <bdwalton@gmail.com>,
Matthias Urlichs <smurf@smurf.noris.de>,
Ryuichi Kokubo <ryu1kkb@gmail.com>,
"Bernhard M. Wiedemann" <bwiedemann@suse.de>
Subject: [PATCH] Call timegm and timelocal with 4-digit year
Date: Fri, 23 Feb 2018 18:20:45 +0100 [thread overview]
Message-ID: <20180223172045.32090-1-bwiedemann@suse.de> (raw)
amazingly timegm(gmtime(0)) is only 0 before 2020
because perl's timegm deviates from GNU timegm(3) in how it handles years.
man Time::Local says
Whenever possible, use an absolute four digit year instead.
with a detailed explanation about ambiguity of 2-digit years above that.
Even though this ambiguity is error-prone with >50% of users getting it
wrong, it has been like this for 20+ years, so we just use 4-digit years
everywhere to be on the safe side.
We add some extra logic to cvsimport because it allows 2-digit year
input and interpreting an 18 as 1918 can be avoided easily and safely.
Signed-off-by: Bernhard M. Wiedemann <bwiedemann@suse.de>
---
contrib/examples/git-svnimport.perl | 2 +-
git-cvsimport.perl | 4 +++-
perl/Git.pm | 4 +++-
perl/Git/SVN.pm | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/contrib/examples/git-svnimport.perl b/contrib/examples/git-svnimport.perl
index c414f0d9c..75a43e23b 100755
--- a/contrib/examples/git-svnimport.perl
+++ b/contrib/examples/git-svnimport.perl
@@ -238,7 +238,7 @@ sub pdate($) {
my($d) = @_;
$d =~ m#(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)#
or die "Unparseable date: $d\n";
- my $y=$1; $y-=1900 if $y>1900;
+ my $y=$1; $y+=1900 if $y<1000;
return timegm($6||0,$5,$4,$3,$2-1,$y);
}
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 2d8df8317..b31613cb8 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -601,7 +601,9 @@ sub pdate($) {
my ($d) = @_;
m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
or die "Unparseable date: $d\n";
- my $y=$1; $y-=1900 if $y>1900;
+ my $y=$1;
+ $y+=100 if $y<70;
+ $y+=1900 if $y<1000;
return timegm($6||0,$5,$4,$3,$2-1,$y);
}
diff --git a/perl/Git.pm b/perl/Git.pm
index ffa09ace9..df62518c7 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -534,7 +534,9 @@ If TIME is not supplied, the current local time is used.
sub get_tz_offset {
# some systems don't handle or mishandle %z, so be creative.
my $t = shift || time;
- my $gm = timegm(localtime($t));
+ my @t = localtime($t);
+ $t[5] += 1900;
+ my $gm = timegm(@t);
my $sign = qw( + + - )[ $gm <=> $t ];
return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
}
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index bc4eed3d7..991a5885e 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1405,7 +1405,7 @@ sub parse_svn_date {
$ENV{TZ} = 'UTC';
my $epoch_in_UTC =
- Time::Local::timelocal($S, $M, $H, $d, $m - 1, $Y - 1900);
+ Time::Local::timelocal($S, $M, $H, $d, $m - 1, $Y);
# Determine our local timezone (including DST) at the
# time of $epoch_in_UTC. $Git::SVN::Log::TZ stored the
--
2.13.6
next reply other threads:[~2018-02-23 17:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-23 17:20 Bernhard M. Wiedemann [this message]
2018-02-23 22:28 ` [PATCH] Call timegm and timelocal with 4-digit year Junio C Hamano
2018-02-24 22:28 ` Ævar Arnfjörð Bjarmason
2018-02-26 10:59 ` Bernhard M. Wiedemann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180223172045.32090-1-bwiedemann@suse.de \
--to=bwiedemann@suse.de \
--cc=bdwalton@gmail.com \
--cc=git@vger.kernel.org \
--cc=ryu1kkb@gmail.com \
--cc=smurf@smurf.noris.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).