Merge branch 'ma/roll-back-lockfiles'

diff --git a/perl/Git.pm b/perl/Git.pm
index 9d60d7948b22254e6f61cc0d984b4ef40f27bc4f..a7440a1f096aa193a21688414669300425146382 100644 (file)
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -534,7 +534,9 @@ sub version {
 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]);
 }