From eceec26795b5227110f2209acbcc6aa6a21ba108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 22 Nov 2017 21:43:27 +0000
Subject: [PATCH] Try to always find the merge base using `origin/#{branch}`
 instead of just `#{branch}`

---
 lib/gitlab/ee_compat_check.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index 3a6165f504c..ac730278ca7 100644
--- 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}"