mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-31 22:37:54 +01:00
Code Activity

Merge branch 'zf/maint-gitweb-acname'

Browse source 
* zf/maint-gitweb-acname:
  gitweb: parse_commit_text encoding fix
This commit is contained in:
Junio C Hamano 2009-08-10 22:16:47 -07:00
commit 9c5164032f
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gitweb/gitweb.perl
View file

@ -2573,7 +2573,7 @@ sub parse_commit_text {
} elsif ((!defined $withparents) && ($line =~ m/^parent ([0-9a-fA-F]{40})$/)) { } elsif ((!defined $withparents) && ($line =~ m/^parent ([0-9a-fA-F]{40})$/)) {
push @parents, $1; push @parents, $1;
} elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) { } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
$co{'author'} = $1; $co{'author'} = to_utf8($1);
$co{'author_epoch'} = $2; $co{'author_epoch'} = $2;
$co{'author_tz'} = $3; $co{'author_tz'} = $3;
if ($co{'author'} =~ m/^([^<]+) <([^>]*)>/) { if ($co{'author'} =~ m/^([^<]+) <([^>]*)>/) {
@ -2583,10 +2583,9 @@ sub parse_commit_text {
$co{'author_name'} = $co{'author'}; $co{'author_name'} = $co{'author'};
} }
} elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) { } elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) {
$co{'committer'} = $1; $co{'committer'} = to_utf8($1);
$co{'committer_epoch'} = $2; $co{'committer_epoch'} = $2;
$co{'committer_tz'} = $3; $co{'committer_tz'} = $3;
$co{'committer_name'} = $co{'committer'};
if ($co{'committer'} =~ m/^([^<]+) <([^>]*)>/) { if ($co{'committer'} =~ m/^([^<]+) <([^>]*)>/) {
$co{'committer_name'} = $1; $co{'committer_name'} = $1;
$co{'committer_email'} = $2; $co{'committer_email'} = $2;