summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Rcs/git.pm5
-rw-r--r--debian/changelog2
2 files changed, 6 insertions, 1 deletions
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 5668936dd..036900887 100644
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -383,7 +383,10 @@ sub rcs_recentchanges ($) { #{{{
diffurl => $diffurl,
};
}
- push @messages, { line => $_ } foreach @{$ci->{'comment'}};
+
+ push @messages, { line => $_ } foreach grep {
+ ! m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i
+ } @{$ci->{'comment'}};
my ($user, $type) = (q{}, "web");
diff --git a/debian/changelog b/debian/changelog
index ca916bcd3..df09e91c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ikiwiki (2.47) UNRELEASED; urgency=low
an orphaned page.
* inline: Display a message if the 'pages' parameter is missing, before
it just expanded to nothing.
+ * git: Skip over signed-off-by and similar lines in commit messages
+ when generating recentchanges.
-- Joey Hess <joeyh@debian.org> Tue, 13 May 2008 12:30:18 -0400