diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-07 01:54:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-07 01:54:08 +0300 |
| commit | 179e1f53b8a8ce4ea756e644fc1da0006d8f0c25 (patch) | |
| tree | 997bfbc5ad35898edcdc42464c2245f992678e7c /perl | |
| parent | 6c3e6f6fcbdd12c70a849e4e1be57d82edb8f14f (diff) | |
| parent | a40e06ee336d608cfe0928d91d2b44112d8fd1e2 (diff) | |
Merge branch 'bw/perl-timegm-timelocal-fix'
Y2k20 fix ;-) for our perl scripts.
* bw/perl-timegm-timelocal-fix:
perl: call timegm and timelocal with 4-digit year
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/Git.pm | 4 | ||||
| -rw-r--r-- | perl/Git/SVN.pm | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl/Git.pm b/perl/Git.pm index 9d60d7948b..a7440a1f09 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 bc4eed3d75..991a5885e9 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 |