From f5ab0f52a10d23f300338a29389f78cf8cda1136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 22 Nov 2017 22:07:57 +0000
Subject: [PATCH] Generate the patch against `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 ac730278ca7..66b2c60e8eb 100644
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -91,7 +91,7 @@ module Gitlab
 
       step(
         "Generating the patch against #{remote}/master in #{patch_path}",
-        %W[git diff --binary #{remote}/master...#{branch}]
+        %W[git diff --binary #{remote}/master...origin/#{branch}]
       ) do |output, status|
         throw(:halt_check, :ko) unless status.zero?
 
-- 
GitLab