summaryrefslogtreecommitdiff
path: root/gitweb/gitweb.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-11 05:16:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-11 05:16:47 (GMT)
commit9c5164032f4c25090e6139a202825febb830feea (patch)
tree72d8cf819b6afe936f8dfb5e7513b10f7bb6d97e /gitweb/gitweb.perl
parent38a9f35d1f7d2d90dafbbf4c45ac9500260eaeb0 (diff)
parent5ed5bbc7e1c3a0144db42d6ec4689e01b2f37516 (diff)
downloadgit-9c5164032f4c25090e6139a202825febb830feea.zip
git-9c5164032f4c25090e6139a202825febb830feea.tar.gz
git-9c5164032f4c25090e6139a202825febb830feea.tar.bz2
Merge branch 'zf/maint-gitweb-acname'
* zf/maint-gitweb-acname: gitweb: parse_commit_text encoding fix
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 37120a3..9d66bc6 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2573,7 +2573,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/^([^<]+) <([^>]*)>/) {
@@ -2583,10 +2583,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;