Merge branch 'jk/smart-http-protocol-doc-fix' into next

diff --git a/perl/Git.pm b/perl/Git.pm
index 65e6b32a0f6401bd749ea26700a3f59939db2aa5..a7440a1f096aa193a21688414669300425146382 100644 (file)
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -101,7 +101,7 @@ =head1 DESCRIPTION
 
 
 use Carp qw(carp croak); # but croak is bad - throw instead
-use Error qw(:try);
+use Git::Error qw(:try);
 use Cwd qw(abs_path cwd);
 use IPC::Open2 qw(open2);
 use Fcntl qw(SEEK_SET SEEK_CUR);
@@ -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]);
 }