summaryrefslogtreecommitdiff
path: root/IkiWiki/Rcs
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-06-19 03:33:23 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-06-19 03:33:23 +0000
commit77c7582f7221bf07e9704387203fa156b0d7bd4b (patch)
tree6a52fedde5d1bf5285ebe12ddca80dcf94ce90d2 /IkiWiki/Rcs
parent8fe50707c36a6f228091d4b022398a1f3d559f1b (diff)
* Patch from Recai to fix git recentchanges code to work with git 1.4 which
changed some output. * Copyright update.
Diffstat (limited to 'IkiWiki/Rcs')
-rw-r--r--IkiWiki/Rcs/git.pm13
1 files changed, 4 insertions, 9 deletions
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 3fedd64f1..f29ffa162 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -1,8 +1,4 @@
#!/usr/bin/perl
-# Git backend for IkiWiki.
-# Copyright 2006 Recai Oktaş <roktas@debian.org>
-#
-# Licensed under the same terms as IkiWiki.
use warnings;
use strict;
@@ -161,7 +157,7 @@ sub _parse_diff_tree (@) { #{{{
my %ci;
# Header line.
HEADER: while (my $line = shift @{ $dt_ref }) {
- return if $line !~ m/^diff-tree ($sha1_pattern)/;
+ return if $line !~ m/^(.+) ($sha1_pattern)/;
my $sha1 = $1;
$ci{'sha1'} = $sha1;
@@ -264,6 +260,8 @@ sub git_commit_info (;$$) { #{{{
push @ci, $parsed;
}
+ warn "Cannot parse commit info for '$sha1' commit" if !@ci;
+
return wantarray ? @ci : $ci[0];
} #}}}
@@ -420,10 +418,7 @@ sub rcs_notify () { #{{{
my $sha1 = 'HEAD'; # the commit which triggers this action
my $ci = git_commit_info($sha1);
- if (!defined $ci) {
- warn "Cannot parse info for '$sha1' commit";
- return;
- }
+ return if !defined $ci;
my @changed_pages = map { $_->{'file'} } @{ $ci->{'details'} };