Commit eceec267 authored by Rémy Coutable's avatar Rémy Coutable

Try to always find the merge base using `origin/#{branch}` instead of just `#{branch}`

parent 9fefb6c2
...@@ -182,7 +182,7 @@ module Gitlab ...@@ -182,7 +182,7 @@ module Gitlab
def merge_base_found?(master_remote:, branch:) def merge_base_found?(master_remote:, branch:)
step( step(
"Finding merge base with #{master_remote}/master", "Finding merge base with #{master_remote}/master",
%W[git merge-base #{master_remote}/master #{branch}] %W[git merge-base #{master_remote}/master origin/#{branch}]
) do |output, status| ) do |output, status|
if status.zero? if status.zero?
puts "Merge base was found: #{output}" puts "Merge base was found: #{output}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment