Merge branch 'master' into sipb

[ikiwiki.git] / IkiWiki / Plugin / git.pm

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 77c0678bcbd8dfd32c13b164477ea899d0c9f38a..3291b927575361fda3534a2365b5c7ed5c979ea2 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -4,6 +4,7 @@ package IkiWiki::Plugin::git;
 use warnings;
 use strict;
 use IkiWiki;
+use IkiWiki::UserInfo;
 use Encode;
 use URI::Escape q{uri_escape_utf8};
 use open qw{:utf8 :std};
@@ -571,7 +572,8 @@ sub rcs_commit_helper (@) {
                }
                if (defined $u) {
                        $u=encode_utf8($u);
-                       $ENV{GIT_AUTHOR_NAME}=$u;
+                       # MITLOGIN This algorithm could be improved
+                       $ENV{GIT_AUTHOR_NAME}=IkiWiki::userinfo_get($u, "realname");
                }
                if (defined $params{session}->param("nickname")) {
                        $u=encode_utf8($params{session}->param("nickname"));
@@ -579,7 +581,7 @@ sub rcs_commit_helper (@) {
                        $u=~s/[^-_0-9[:alnum:]]+//g;
                }
                if (defined $u) {
-                       $ENV{GIT_AUTHOR_EMAIL}="$u\@web";
+                       $ENV{GIT_AUTHOR_EMAIL}="$u\@mit.edu";
                }
        }