diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-06 23:54:08 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-06 23:54:08 +0100 |
commit | 179e1f53b8a8ce4ea756e644fc1da0006d8f0c25 (patch) | |
tree | 997bfbc5ad35898edcdc42464c2245f992678e7c /perl/Git.pm | |
parent | Merge branch 'jk/strbuf-read-file-close-error' (diff) | |
parent | perl: call timegm and timelocal with 4-digit year (diff) | |
download | git-179e1f53b8a8ce4ea756e644fc1da0006d8f0c25.tar.xz git-179e1f53b8a8ce4ea756e644fc1da0006d8f0c25.zip |
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/Git.pm')
-rw-r--r-- | perl/Git.pm | 4 |
1 files changed, 3 insertions, 1 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]); } |