summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2011-03-19 22:53:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-20 04:46:32 (GMT)
commit6368d9f1af7a5d4c8af2f11ffdb6af577f1e98f5 (patch)
tree88d280ce2fc7c6219b00b63d687d0a004f0ac918
parent958bf6b768aa10fa3985886d312bd0365dee7677 (diff)
downloadgit-6368d9f1af7a5d4c8af2f11ffdb6af577f1e98f5.zip
git-6368d9f1af7a5d4c8af2f11ffdb6af577f1e98f5.tar.gz
git-6368d9f1af7a5d4c8af2f11ffdb6af577f1e98f5.tar.bz2
gitweb: Always call parse_date with timezone parameter
Timezone is required to correctly set local time, which would be needed for future 'localtime' feature. While at it, remove unnecessary call to the function from git_log_body, as its return value is not used anywhere. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgitweb/gitweb.perl5
1 files changed, 2 insertions, 3 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index b04ab8c..9dccfb0 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -4906,7 +4906,6 @@ sub git_log_body {
next if !%co;
my $commit = $co{'id'};
my $ref = format_ref_marker($refs, $commit);
- my %ad = parse_date($co{'author_epoch'});
git_print_header_div('commit',
"<span class=\"age\">$co{'age_string'}</span>" .
esc_html($co{'title'}) . $ref,
@@ -7064,7 +7063,7 @@ sub git_feed {
if (defined($commitlist[0])) {
%latest_commit = %{$commitlist[0]};
my $latest_epoch = $latest_commit{'committer_epoch'};
- %latest_date = parse_date($latest_epoch);
+ %latest_date = parse_date($latest_epoch, $latest_commit{'comitter_tz'});
my $if_modified = $cgi->http('IF_MODIFIED_SINCE');
if (defined $if_modified) {
my $since;
@@ -7195,7 +7194,7 @@ XML
if (($i >= 20) && ((time - $co{'author_epoch'}) > 48*60*60)) {
last;
}
- my %cd = parse_date($co{'author_epoch'});
+ my %cd = parse_date($co{'author_epoch'}, $co{'author_tz'});
# get list of changed files
open my $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts,