Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index f4b8eff58ea6f0e46609aa7f596066169ae2faff..9640acfbe284ec476af79fc365c581b1a761ab26 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -407,7 +407,7 @@ sub rcs_recentchanges ($) { #{{{
                }
 
                push @rets, {
-                       rev        => $sha1,
+                       id         => $sha1,
                        user       => $user,
                        committype => $type,
                        when       => $when,
@@ -432,8 +432,7 @@ sub rcs_notify () { #{{{
        # hook is called _before_ the repository is updated).
        #
        # Here, we rely on a simple fact: we can extract all parts of the
-       # notification content by parsing the "HEAD" commit (which also
-       # triggers a refresh of IkiWiki pages).
+       # notification content by parsing the "HEAD" commit.
 
        my $ci = git_commit_info('HEAD');
        return if !defined $ci;
@@ -442,7 +441,7 @@ sub rcs_notify () { #{{{
 
        my ($user, $message);
        if (@{ $ci->{'comment'} }[0] =~ m/$config{web_commit_regexp}/) {
-               $user    = defined $2 ? "$2" : "$3";
+               $user    = defined $2 ? $2 : $3;
                $message = $4;
        }
        else {