undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zf/maint-gitweb-acname' into maint

Browse Source 
* zf/maint-gitweb-acname:
  gitweb: parse_commit_text encoding fix
This commit is contained in:
Junio C Hamano 2009-08-21 11:34:17 -07:00
commit d3ebb174ea
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

@ -2570,7 +2570,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/^([^<]+) <([^>]*)>/) {
@ -2580,10 +2580,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;