diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-22 21:43:27 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-22 23:26:32 +0100 |
| commit | eceec26795b5227110f2209acbcc6aa6a21ba108 (patch) | |
| tree | 925be80067c433ceff8b58d92f93353248eef44e | |
| parent | 9fefb6c2be1e9772599aa376ae8ae37241ace0c6 (diff) | |
| download | gitlab-ce-eceec26795b5227110f2209acbcc6aa6a21ba108.tar.gz | |
Try to always find the merge base using `origin/#{branch}` instead of just `#{branch}`
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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}" |