Merge branch 'jc/color-diff-doc'

diff --git a/perl/Git.pm b/perl/Git.pm
index 5649bcc3b1461d0beb703289b4608283df05081d..a56d1e76f797cdba83510a5488945425f1936c2d 100644 (file)
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -103,7 +103,7 @@ =head1 DESCRIPTION
 use Cwd qw(abs_path cwd);
 use IPC::Open2 qw(open2);
 use Fcntl qw(SEEK_SET SEEK_CUR);
-use Time::Local qw(timelocal);
+use Time::Local qw(timegm);
 }
 
 
@@ -528,8 +528,8 @@ sub version {
 sub get_tz_offset {
        # some systmes don't handle or mishandle %z, so be creative.
        my $t = shift || time;
-       my $gm = timelocal(gmtime($t));
-       my $sign = qw( + + - )[ $t <=> $gm ];
+       my $gm = timegm(localtime($t));
+       my $sign = qw( + + - )[ $gm <=> $t ];
        return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
 }