diff options
| author | Neil Moore <neil@s-z.org> | 2012-10-03 14:45:28 -0500 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2012-10-03 14:45:28 -0500 |
| commit | e99bc34170fae2d53c36dded83ef64bbcf836a9c (patch) | |
| tree | 50215baeced7c99a1497ef335ee4416f02526510 | |
| parent | 494144e9a93e697a44cc1d1afc58039de6b67fca (diff) | |
| download | crawlbot-e99bc34170fae2d53c36dded83ef64bbcf836a9c.tar.gz crawlbot-e99bc34170fae2d53c36dded83ef64bbcf836a9c.zip | |
Do announce commits to master.
| -rw-r--r-- | lib/Crawl/Bot/Plugin/Commit.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Crawl/Bot/Plugin/Commit.pm b/lib/Crawl/Bot/Plugin/Commit.pm index 7937c2f..74cf10e 100644 --- a/lib/Crawl/Bot/Plugin/Commit.pm +++ b/lib/Crawl/Bot/Plugin/Commit.pm @@ -85,7 +85,9 @@ sub tick { chomp ($old_head, $head); next if $old_head eq $head; - my @revs = split /\n/, `git rev-list $head ^$old_head ^master`; + # Exclude merges from master into other branches. + my $exclude_master = $branch eq "master" ? "" : "^master"; + my @revs = split /\n/, `git rev-list $head ^$old_head $exclude_master`; if (!$self->has_branch($branch)) { my $nrev = scalar @revs; |