From 8325c4c98879e0d5219efa51e79105338257ae97 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Mon, 15 Feb 2010 03:58:19 -0600 Subject: cherry-picks might have the message in the subject --- lib/Crawl/Bot/Plugin/Commit.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Crawl/Bot/Plugin/Commit.pm b/lib/Crawl/Bot/Plugin/Commit.pm index d21fae8..2536913 100644 --- a/lib/Crawl/Bot/Plugin/Commit.pm +++ b/lib/Crawl/Bot/Plugin/Commit.pm @@ -59,7 +59,8 @@ sub tick { my %commits = map { $_, $self->parse_commit($_) } @revs; my $cherry_picks = @revs; - @revs = grep { $commits{$_}->{body} !~ /\(cherry picked from / } @revs; + @revs = grep { $commits{$_}->{subject} !~ /\(cherry picked from / + && $commits{$_}->{body} !~ /\(cherry picked from / } @revs; $cherry_picks -= @revs; $self->say_all("Cherry-picked $cherry_picks commits into $branch") if $cherry_picks > 0; -- cgit v1.2.3-54-g00ecf