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?ds=inline;hp=-c

Merge branch 'zf/maint-gitweb-acname'

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

9c5164032f4c25090e6139a202825febb830feea
diff --combined gitweb/gitweb.perl
index 37120a3e60,4f051942bd..9d66bc61a4
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -940,13 -940,10 +940,13 @@@ sub href 
  			if (defined $params{'hash_parent_base'}) {
  				$href .= esc_url($params{'hash_parent_base'});
  				# skip the file_parent if it's the same as the file_name
 -				delete $params{'file_parent'} if $params{'file_parent'} eq $params{'file_name'};
 -				if (defined $params{'file_parent'} && $params{'file_parent'} !~ /\.\./) {
 -					$href .= ":/".esc_url($params{'file_parent'});
 -					delete $params{'file_parent'};
 +				if (defined $params{'file_parent'}) {
 +					if (defined $params{'file_name'} && $params{'file_parent'} eq $params{'file_name'}) {
 +						delete $params{'file_parent'};
 +					} elsif ($params{'file_parent'} !~ /\.\./) {
 +						$href .= ":/".esc_url($params{'file_parent'});
 +						delete $params{'file_parent'};
 +					}
  				}
  				$href .= "..";
  				delete $params{'hash_parent'};
@@@ -2573,7 -2570,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 -2580,9 +2583,9 @@@
  				$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;