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

2017-11-22 21:43:27 +00:00 · 2017-11-22 21:43:27 +00:00 · eceec26795
parent 9fefb6c2be
commit eceec26795
1 changed files with 1 additions and 1 deletions
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@ -182,7 +182,7 @@ module Gitlab
    def merge_base_found?(master_remote:, branch:)
      step(
        "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|
        if status.zero?
          puts "Merge base was found: #{output}"