Merge commit '4dbb8120f760d9009f0c2639f2ccb9808150aed5' into sipb

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

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index cf7fbe9b7c43ee53180612d0411e6202074fb9e0..b5b25cf7ad68329cd597898e65d61d5fc6c0f4bf 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 open qw{:utf8 :std};
 
@@ -527,7 +528,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"));
@@ -535,7 +537,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";
                }
        }