Always fetch master from the canonical remote

This way, if a fork's master branch is far behind the canonical's master, it won't use the tip of the fork's master branch as merge base and thus won't create a huge and wrong patch file. Signed-off-by: Rémy Coutable <remy@rymai.me>

Always fetch master from the canonical remote
54533920 · Rémy Coutable · a4072db0 · 54533920
Unverified Commit 54533920 authored Nov 15, 2017 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

ee_compat_check.rb lib/gitlab/ee_compat_check.rb +3 -3

No files found.
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -193,7 +193,7 @@ module Gitlab
          # Repository is initially cloned with a depth of 20 so we need to fetch
          # deeper in the case the branch has more than 20 commits on top of master
          fetch(branch: branch, depth: depth)
-          fetch(branch: 'master', depth: depth)
+          fetch(branch: 'master', depth: depth, remote: DEFAULT_CE_PROJECT_URL)
          merge_base_found?
        end
@@ -201,10 +201,10 @@ module Gitlab
      raise "\n#{branch} is too far behind master, please rebase it!\n" unless success
    end
-    def fetch(branch:, depth:)
+    def fetch(branch:, depth:, remote: 'origin')
      step(
        "Fetching deeper...",
-        %W[git fetch --depth=#{depth} --prune origin +refs/heads/#{branch}:refs/remotes/origin/#{branch}]
+        %W[git fetch --depth=#{depth} --prune #{remote} +refs/heads/#{branch}:refs/remotes/origin/#{branch}]
      ) do |output, status|
        raise "Fetch failed: #{output}" unless status.zero?
      end