From: Junio C Hamano Date: Thu, 26 Feb 2015 22:03:57 +0000 (-0800) Subject: Merge branch 'svn-maint-fixes' into svn-fixes X-Git-Tag: v2.4.0-rc0~66^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28ed7b02dd726bcc5c8d3fc316c965a3c0f05c04;p=thirdparty%2Fgit.git 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 --- 28ed7b02dd726bcc5c8d3fc316c965a3c0f05c04 diff --cc perl/Git/SVN.pm index afa562c8b9,7006219c0a..152fb7e927 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@@ -9,9 -9,12 +9,10 @@@ use vars qw/$_no_metadat $_use_log_author $_add_author_from $_localtime/; use Carp qw/croak/; use File::Path qw/mkpath/; -use File::Copy qw/copy/; 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