diff options
| -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; |