diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-02-14 22:29:44 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-02-14 22:29:44 +0400 |
commit | 01e1406100cff1cc9d1ad2f0c766aaa8c55ebc27 (patch) | |
tree | f7fbf235fd6b43678312cadcf98af0594d14558c /perl/Git/SVN.pm | |
parent | ba56d7057a5da9eb3485391658ba7465c855a8f3 (diff) | |
parent | 48c916285753907b71a0ef663576f01ee260095c (diff) |
Merge branch 'bw/get-tz-offset-perl'
* bw/get-tz-offset-perl:
cvsimport: format commit timestamp ourselves without using strftime
perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases
Move Git::SVN::get_tz to Git::get_tz_offset
Diffstat (limited to 'perl/Git/SVN.pm')
-rw-r--r-- | perl/Git/SVN.pm | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index 490e330380..0ebc68ac7e 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -11,7 +11,6 @@ use Carp qw/croak/; use File::Path qw/mkpath/; use File::Copy qw/copy/; use IPC::Open3; -use Time::Local; use Memoize; # core since 5.8.0, Jul 2002 use Memoize::Storable; use POSIX qw(:signal_h); @@ -22,6 +21,7 @@ use Git qw( command_noisy command_output_pipe command_close_pipe + get_tz_offset ); use Git::SVN::Utils qw( fatal @@ -1311,14 +1311,6 @@ sub get_untracked { \@out; } -sub get_tz { - # 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 ]; - return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]); -} - # parse_svn_date(DATE) # -------------------- # Given a date (in UTC) from Subversion, return a string in the format @@ -1351,7 +1343,7 @@ sub parse_svn_date { delete $ENV{TZ}; } - my $our_TZ = get_tz(); + my $our_TZ = get_tz_offset(); # This converts $epoch_in_UTC into our local timezone. my ($sec, $min, $hour, $mday, $mon, $year, |