From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Aug 2009 05:16:47 +0000 (-0700)
Subject: Merge branch 'zf/maint-gitweb-acname'
X-Git-Tag: v1.6.5-rc0~81
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9c5164032f4c25090e6139a202825febb830feea?hp=38a9f35d1f7d2d90dafbbf4c45ac9500260eaeb0

Merge branch 'zf/maint-gitweb-acname'

* zf/maint-gitweb-acname:
gitweb: parse_commit_text encoding fix
---

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 37120a3e60..9d66bc61a4 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;