mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bw/get-tz-offset-perl'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2013-02-14 10:29:44 -08:00
parent ba56d7057a 48c9162857
commit 01e1406100
4 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
perl/Git/SVN.pm
View File

@ -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,