kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Rémy Coutable 2017-11-22 21:43:27 +00:00
parent 9fefb6c2be
commit eceec26795
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/gitlab/ee_compat_check.rb
View file

@ -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}"