lib/danger/scm_source/git_repo.rb in danger-additional-logging-0.0.11 vs lib/danger/scm_source/git_repo.rb in danger-additional-logging-0.0.12
- old
+ new
@@ -181,9 +181,12 @@
end
end
def possible_merge_base(repo, from, to)
puts "possible_merge_base(from=#{from}, to=#{to})"
+ exec("rev-list --max-parents=0 #{from}")
+ exec("rev-list --max-parents=0 #{to}")
+
[repo.merge_base(from, to)].find { |base| commit_exists?(base) }
end
def commits_in_branch_count(from, to)
exec("rev-list #{from}..#{to} --count").to_i