Merge branch 'rd/tag-doc-lightweight'

diff --git a/perl/Git.pm b/perl/Git.pm
index 9f246c7988f5ff43ecf8ea3465387a526a66e6f4..d856930b2e5f31bb7b1e7aef46e8e056068bb431 100644 (file)
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -536,7 +536,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]);
 }
@@ -552,7 +554,7 @@ sub get_record {
        my ($fh, $rs) = @_;
        local $/ = $rs;
        my $rec = <$fh>;
-       chomp $rec if defined $rs;
+       chomp $rec if defined $rec;
        $rec;
 }