diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-21 11:34:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-21 11:34:17 -0700 |
| commit | d3ebb174ea0881ff1d801174d18271bfc50245e3 (patch) | |
| tree | 2b6d4811c8d7239e8ff0a1b7f3fd6990364911be /gitweb | |
| parent | f393747c4c1328d01840a4a3345b859c2dea24a5 (diff) | |
| parent | 5ed5bbc7e1c3a0144db42d6ec4689e01b2f37516 (diff) | |
| download | git-d3ebb174ea0881ff1d801174d18271bfc50245e3.tar.gz git-d3ebb174ea0881ff1d801174d18271bfc50245e3.tar.xz | |
Merge branch 'zf/maint-gitweb-acname' into maint
* zf/maint-gitweb-acname:
gitweb: parse_commit_text encoding fix
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 7fbd5ff89..4f051942b 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; |