зеркало из https://github.com/microsoft/git.git
gitweb: use git_print_authorship_rows in 'tag' view too
parse_tag must be adapted to use the hash keys expected by git_print_authorship_rows. This is not a problem since git_tag is the only user of this sub. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
f88bafadd9
Коммит
ba9247339d
|
@ -2409,8 +2409,14 @@ sub parse_tag {
|
||||||
$tag{'name'} = $1;
|
$tag{'name'} = $1;
|
||||||
} elsif ($line =~ m/^tagger (.*) ([0-9]+) (.*)$/) {
|
} elsif ($line =~ m/^tagger (.*) ([0-9]+) (.*)$/) {
|
||||||
$tag{'author'} = $1;
|
$tag{'author'} = $1;
|
||||||
$tag{'epoch'} = $2;
|
$tag{'author_epoch'} = $2;
|
||||||
$tag{'tz'} = $3;
|
$tag{'author_tz'} = $3;
|
||||||
|
if ($tag{'author'} =~ m/^([^<]+) <([^>]*)>/) {
|
||||||
|
$tag{'author_name'} = $1;
|
||||||
|
$tag{'author_email'} = $2;
|
||||||
|
} else {
|
||||||
|
$tag{'author_name'} = $tag{'author'};
|
||||||
|
}
|
||||||
} elsif ($line =~ m/--BEGIN/) {
|
} elsif ($line =~ m/--BEGIN/) {
|
||||||
push @comment, $line;
|
push @comment, $line;
|
||||||
last;
|
last;
|
||||||
|
@ -4620,11 +4626,7 @@ sub git_tag {
|
||||||
$tag{'type'}) . "</td>\n" .
|
$tag{'type'}) . "</td>\n" .
|
||||||
"</tr>\n";
|
"</tr>\n";
|
||||||
if (defined($tag{'author'})) {
|
if (defined($tag{'author'})) {
|
||||||
my %ad = parse_date($tag{'epoch'}, $tag{'tz'});
|
git_print_authorship_rows(\%tag, 'author');
|
||||||
print "<tr><td>author</td><td>" . esc_html($tag{'author'}) . "</td></tr>\n";
|
|
||||||
print "<tr><td></td><td>" . $ad{'rfc2822'} .
|
|
||||||
sprintf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}) .
|
|
||||||
"</td></tr>\n";
|
|
||||||
}
|
}
|
||||||
print "</table>\n\n" .
|
print "</table>\n\n" .
|
||||||
"</div>\n";
|
"</div>\n";
|
||||||
|
|
Загрузка…
Ссылка в новой задаче