Skip to content

Commit 9c51640

Browse files
committed
Merge branch 'zf/maint-gitweb-acname'
* zf/maint-gitweb-acname: gitweb: parse_commit_text encoding fix
2 parents 38a9f35 + 5ed5bbc commit 9c51640

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

gitweb/gitweb.perl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2573,7 +2573,7 @@ sub parse_commit_text {
25732573
} elsif ((!defined $withparents) && ($line =~ m/^parent ([0-9a-fA-F]{40})$/)) {
25742574
push @parents, $1;
25752575
} elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
2576-
$co{'author'} = $1;
2576+
$co{'author'} = to_utf8($1);
25772577
$co{'author_epoch'} = $2;
25782578
$co{'author_tz'} = $3;
25792579
if ($co{'author'} =~ m/^([^<]+) <([^>]*)>/) {
@@ -2583,10 +2583,9 @@ sub parse_commit_text {
25832583
$co{'author_name'} = $co{'author'};
25842584
}
25852585
} elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) {
2586-
$co{'committer'} = $1;
2586+
$co{'committer'} = to_utf8($1);
25872587
$co{'committer_epoch'} = $2;
25882588
$co{'committer_tz'} = $3;
2589-
$co{'committer_name'} = $co{'committer'};
25902589
if ($co{'committer'} =~ m/^([^<]+) <([^>]*)>/) {
25912590
$co{'committer_name'} = $1;
25922591
$co{'committer_email'} = $2;

0 commit comments

Comments
 (0)