diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:04:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:04:03 -0800 |
| commit | 8552e2e5905b56db9a61da94f9eaf376a6e57b89 (patch) | |
| tree | 72339491fb623b522de2ac222ceb3ff13f71cc06 /perl/Git/SVN/Log.pm | |
| parent | Merge branch 'al/mergetool-printf-fix' into maint (diff) | |
| parent | cvsimport: format commit timestamp ourselves without using strftime (diff) | |
| download | tgif-8552e2e5905b56db9a61da94f9eaf376a6e57b89.tar.xz | |
Merge branch 'bw/get-tz-offset-perl' into maint
* 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/Log.pm')
| -rw-r--r-- | perl/Git/SVN/Log.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/perl/Git/SVN/Log.pm b/perl/Git/SVN/Log.pm index 3cc1c6f081..3f8350a57d 100644 --- a/perl/Git/SVN/Log.pm +++ b/perl/Git/SVN/Log.pm @@ -2,7 +2,11 @@ package Git::SVN::Log; use strict; use warnings; use Git::SVN::Utils qw(fatal); -use Git qw(command command_oneline command_output_pipe command_close_pipe); +use Git qw(command + command_oneline + command_output_pipe + command_close_pipe + get_tz_offset); use POSIX qw/strftime/; use constant commit_log_separator => ('-' x 72) . "\n"; use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline @@ -119,7 +123,7 @@ sub run_pager { sub format_svn_date { my $t = shift || time; require Git::SVN; - my $gmoff = Git::SVN::get_tz($t); + my $gmoff = get_tz_offset($t); return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t)); } |