diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-05 12:45:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 12:45:45 -0800 |
| commit | a6f9decbe30318a0fdc4c7cad61e5e20b344d0d4 (patch) | |
| tree | 1c83a87dcc334d2f83204a28d81c5cbb1a44b9ab /perl/Git/SVN.pm | |
| parent | Merge branch 'tb/connect-ipv6-parse-fix' (diff) | |
| parent | Git::SVN::*: avoid premature FileHandle closure (diff) | |
| download | tgif-a6f9decbe30318a0fdc4c7cad61e5e20b344d0d4.tar.xz | |
Merge branch 'ew/svn-maint-fixes'
Correct a breakage to git-svn around v2.2 era that triggers
premature closing of FileHandle.
* ew/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.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index 8e4af7153e..f24372645b 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -14,6 +14,7 @@ use IPC::Open3; use Memoize; # core since 5.8.0, Jul 2002 use Memoize::Storable; use POSIX qw(:signal_h); +use Time::Local; use Git qw( command @@ -1332,7 +1333,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 |