Migrate everything else via prefix_directives

[git.ikiwiki.info.git] / IkiWiki / Rcs / git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 26f2a39f266b88e477f75545533b2b4d5dfc524a..7fb612a39bdc56c4b7931a48ab9f8a8db76d55ac 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -319,11 +319,12 @@ sub rcs_commit ($$$;$$) { #{{{
                return $conflict if defined $conflict;
        }
        
-       # Set the commit author to the web committer.
+       # Set the commit author and email to the web committer.
        my %env=%ENV;
        if (defined $user || defined $ipaddr) {
-               $ENV{GIT_AUTHOR_NAME}=(defined $user ? $user : $ipaddr)." (web)";
-               $ENV{GIT_AUTHOR_EMAIL}="";
+               my $u=defined $user ? $user : $ipaddr;
+               $ENV{GIT_AUTHOR_NAME}=$u;
+               $ENV{GIT_AUTHOR_EMAIL}="$u\@web";
        }
 
        # git commit returns non-zero if file has not been really changed.
@@ -390,7 +391,7 @@ sub rcs_recentchanges ($) { #{{{
                }
 
                my $user=$ci->{'author_username'};
-               my $web_commit = ($user=~s/\s+\(web\)$//);
+               my $web_commit = ($ci->{'author'} =~ /\@web>/);
                
                # compatability code for old web commit messages
                if (! $web_commit &&
@@ -398,6 +399,7 @@ sub rcs_recentchanges ($) { #{{{
                      $messages[0]->{line} =~ m/$config{web_commit_regexp}/) {
                        $user = defined $2 ? "$2" : "$3";
                        $messages[0]->{line} = $4;
+                       $web_commit=1;
                }
 
                push @rets, {