summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2010-02-15 03:58:19 -0600
committerJesse Luehrs <doy@tozt.net>2010-02-15 03:58:19 -0600
commit8325c4c98879e0d5219efa51e79105338257ae97 (patch)
tree12dec7d9f8bba7185e498cbfbf1d7b37061760c8
parent8a2693f255557450bdd21d314989ff6e02759680 (diff)
downloadcrawlbot-8325c4c98879e0d5219efa51e79105338257ae97.tar.gz
crawlbot-8325c4c98879e0d5219efa51e79105338257ae97.zip
cherry-picks might have the message in the subject
-rw-r--r--lib/Crawl/Bot/Plugin/Commit.pm3
1 files changed, 2 insertions, 1 deletions
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;