diff options
Diffstat (limited to 'IkiWiki/Rcs/git.pm')
| -rw-r--r-- | IkiWiki/Rcs/git.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm index 6cbcfd14e..271c27af6 100644 --- a/IkiWiki/Rcs/git.pm +++ b/IkiWiki/Rcs/git.pm @@ -12,7 +12,7 @@ my $origin_branch = 'origin'; # Git ref for main repository my $master_branch = 'master'; # working branch my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums my $dummy_commit_msg = 'dummy commit'; # message to skip in recent changes -my $web_commit_msg = qr/^web commit by (\w+):?(.*)/; # pattern for web commits +my $web_commit_msg = qr/^web commit (by (\w+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/; sub _safe_git (&@) { #{{{ # Start a child process safely without resorting /bin/sh. @@ -377,8 +377,8 @@ sub rcs_recentchanges ($) { #{{{ if (defined $message[0] && $message[0]->{line} =~ m/$web_commit_msg/) { - $user = "$1"; - $message[0]->{line} = $2; + $user=defined $2 ? "$2" : "$3"; + $message[0]->{line}=$4; } else { $type ="git"; $user = $ci->{'author_username'}; @@ -426,8 +426,8 @@ sub rcs_notify () { #{{{ my ($user, $message); if (@{ $ci->{'comment'} }[0] =~ m/$web_commit_msg/) { - $user = "$1"; - $message = $2; + $user = defined $2 ? "$2" : "$3"; + $message = $4; } else { $user = $ci->{'author_username'}; $message = join "\n", @{ $ci->{'comment'} }; |