summaryrefslogtreecommitdiff
path: root/gitweb/gitweb.perl
diff options
context:
space:
mode:
authorZoltán Füzesi <zfuzesi@eaglet.hu>2009-08-02 07:42:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-05 19:37:13 (GMT)
commit5ed5bbc7e1c3a0144db42d6ec4689e01b2f37516 (patch)
tree04e913a0cf781bbed1c30acdd7d8620a4379f496 /gitweb/gitweb.perl
parent0a53e9ddeaddad63ad106860237bbf53411d11a7 (diff)
downloadgit-5ed5bbc7e1c3a0144db42d6ec4689e01b2f37516.zip
git-5ed5bbc7e1c3a0144db42d6ec4689e01b2f37516.tar.gz
git-5ed5bbc7e1c3a0144db42d6ec4689e01b2f37516.tar.bz2
gitweb: parse_commit_text encoding fix
Call to_utf8 when parsing author and committer names, otherwise they will appear with bad encoding if they written by using chop_and_escape_str. Signed-off-by: Zoltán Füzesi <zfuzesi@eaglet.hu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb/gitweb.perl')
-rwxr-xr-xgitweb/gitweb.perl5
1 files changed, 2 insertions, 3 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 7fbd5ff..4f05194 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2570,7 +2570,7 @@ sub parse_commit_text {
} elsif ((!defined $withparents) && ($line =~ m/^parent ([0-9a-fA-F]{40})$/)) {
push @parents, $1;
} elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
- $co{'author'} = $1;
+ $co{'author'} = to_utf8($1);
$co{'author_epoch'} = $2;
$co{'author_tz'} = $3;
if ($co{'author'} =~ m/^([^<]+) <([^>]*)>/) {
@@ -2580,10 +2580,9 @@ sub parse_commit_text {
$co{'author_name'} = $co{'author'};
}
} elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) {
- $co{'committer'} = $1;
+ $co{'committer'} = to_utf8($1);
$co{'committer_epoch'} = $2;
$co{'committer_tz'} = $3;
- $co{'committer_name'} = $co{'committer'};
if ($co{'committer'} =~ m/^([^<]+) <([^>]*)>/) {
$co{'committer_name'} = $1;
$co{'committer_email'} = $2;