Merge branch 'master' into recentchanges

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

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index fea1c11eb4a9c9f7d599c863abbfa13ebfcaa179..80ffdced26b3318a08a3d469effac42fab33ee29 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -429,13 +429,10 @@ sub rcs_notify () { #{{{
        # hooks/post-update to support IkiWiki commits coming from a
        # cloned repository (through command line) because post-update
        # is called _after_ each ref in repository is updated (update
-       # hook is called _before_ the repository is updated).  Since
-       # post-update hook does not accept command line arguments, we
-       # don't have an $ENV variable in this function.
+       # 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;
@@ -444,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 {