diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2006-11-25 15:54:32 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-25 13:54:32 -0800 |
| commit | ba00b8c1edafcc414cfe13f8a4addac3893c2a29 (patch) | |
| tree | 7653855fc65c659fbff78f6c211db80be5884250 /gitweb | |
| parent | 28b9d9f7c67cfd199c4bc9e1ac5197cb17349b15 (diff) | |
| download | git-ba00b8c1edafcc414cfe13f8a4addac3893c2a29.tar.gz git-ba00b8c1edafcc414cfe13f8a4addac3893c2a29.tar.xz | |
gitweb: Add author and committer email extraction to parse_commit
Extract author email to 'author_email' key, and comitter mail to
'committer_mail' key; uniquify committer and author lines handling
by the way.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 26fc3a689..85a896b61 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -1294,8 +1294,9 @@ sub parse_commit { $co{'author'} = $1; $co{'author_epoch'} = $2; $co{'author_tz'} = $3; - if ($co{'author'} =~ m/^([^<]+) </) { - $co{'author_name'} = $1; + if ($co{'author'} =~ m/^([^<]+) <([^>]*)>/) { + $co{'author_name'} = $1; + $co{'author_email'} = $2; } else { $co{'author_name'} = $co{'author'}; } @@ -1304,7 +1305,12 @@ sub parse_commit { $co{'committer_epoch'} = $2; $co{'committer_tz'} = $3; $co{'committer_name'} = $co{'committer'}; - $co{'committer_name'} =~ s/ <.*//; + if ($co{'committer'} =~ m/^([^<]+) <([^>]*)>/) { + $co{'committer_name'} = $1; + $co{'committer_email'} = $2; + } else { + $co{'committer_name'} = $co{'committer'}; + } } } if (!defined $co{'tree'}) { |