diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-22 22:07:57 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-22 23:26:36 +0100 |
| commit | f5ab0f52a10d23f300338a29389f78cf8cda1136 (patch) | |
| tree | 9b8093a99133a118f2f049362cbd74562c64bba4 | |
| parent | eceec26795b5227110f2209acbcc6aa6a21ba108 (diff) | |
| download | gitlab-ce-f5ab0f52a10d23f300338a29389f78cf8cda1136.tar.gz | |
Generate the patch against `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 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? |