summaryrefslogtreecommitdiff
path: root/perl/Git/SVN.pm
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-26 22:03:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-02-26 22:03:57 (GMT)
commit28ed7b02dd726bcc5c8d3fc316c965a3c0f05c04 (patch)
tree89b62e09fe810cacfa218c4ca3b3bee2d4a90cb2 /perl/Git/SVN.pm
parent47092c10671da906ae626634dc83beb29ce76a9d (diff)
parente426311befe429ad39b47927cd12153b7aa99542 (diff)
downloadgit-28ed7b02dd726bcc5c8d3fc316c965a3c0f05c04.zip
git-28ed7b02dd726bcc5c8d3fc316c965a3c0f05c04.tar.gz
git-28ed7b02dd726bcc5c8d3fc316c965a3c0f05c04.tar.bz2
Merge branch 'svn-maint-fixes' into svn-fixes
* svn-maint-fixes: Git::SVN::*: avoid premature FileHandle closure git-svn: fix localtime=true on non-glibc environments
Diffstat (limited to 'perl/Git/SVN.pm')
-rw-r--r--perl/Git/SVN.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index afa562c..152fb7e 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -12,6 +12,7 @@ use File::Path qw/mkpath/;
use IPC::Open3;
use Memoize; # core since 5.8.0, Jul 2002
use POSIX qw(:signal_h);
+use Time::Local;
use Git qw(
command
@@ -1326,7 +1327,7 @@ sub parse_svn_date {
$ENV{TZ} = 'UTC';
my $epoch_in_UTC =
- POSIX::strftime('%s', $S, $M, $H, $d, $m - 1, $Y - 1900);
+ Time::Local::timelocal($S, $M, $H, $d, $m - 1, $Y - 1900);
# Determine our local timezone (including DST) at the
# time of $epoch_in_UTC. $Git::SVN::Log::TZ stored the