diff options
| -rw-r--r-- | IkiWiki/Rcs/git.pm | 13 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/copyright | 5 |
3 files changed, 12 insertions, 11 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'} }; diff --git a/debian/changelog b/debian/changelog index a8b6e012e..f298045a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ ikiwiki (1.7) UNRELEASED; urgency=low * Updated logo from Recai with some kerning and alingment tuning. + * Patch from Recai to fix git recentchanges code to work with git 1.4 which + changed some output. + * Copyright update. - -- Joey Hess <joeyh@debian.org> Sun, 18 Jun 2006 19:39:36 -0400 + -- Joey Hess <joeyh@debian.org> Sun, 18 Jun 2006 23:30:49 -0400 ikiwiki (1.6) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 4260584e1..ed1dbd08b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,8 @@ ikiwiki is copyright 2006 by Joey Hess <joey@kitenet.net>. It is licensed -under the terms of the GPL. +under the terms of the GPL version 2 or later. + +The git code and logo are copyright 2006 by Recai Oktaş <roktas@debian.org> +under the terms of the GPL version 2 or later. The smiley icons were copied from Moin Moin, which has these copyrights: Copyright (c) 2000 - 2004 by Jürgen Hermann <jh@web.de> |