Commit 1ab674dc authored by Rémy Coutable's avatar Rémy Coutable

Fix EE-specific code following gitlab-org/gitlab-ce!9535

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent aaf65553
...@@ -1024,7 +1024,7 @@ class Repository ...@@ -1024,7 +1024,7 @@ class Repository
end end
def diverged_from_upstream?(branch_name) def diverged_from_upstream?(branch_name)
branch_commit = commit(branch_name) branch_commit = commit("refs/heads/#{branch_name}")
upstream_commit = commit("refs/remotes/#{MIRROR_REMOTE}/#{branch_name}") upstream_commit = commit("refs/remotes/#{MIRROR_REMOTE}/#{branch_name}")
if upstream_commit if upstream_commit
...@@ -1035,7 +1035,7 @@ class Repository ...@@ -1035,7 +1035,7 @@ class Repository
end end
def upstream_has_diverged?(branch_name, remote_ref) def upstream_has_diverged?(branch_name, remote_ref)
branch_commit = commit(branch_name) branch_commit = commit("refs/heads/#{branch_name}")
upstream_commit = commit("refs/remotes/#{remote_ref}/#{branch_name}") upstream_commit = commit("refs/remotes/#{remote_ref}/#{branch_name}")
if upstream_commit if upstream_commit
...@@ -1046,7 +1046,7 @@ class Repository ...@@ -1046,7 +1046,7 @@ class Repository
end end
def up_to_date_with_upstream?(branch_name) def up_to_date_with_upstream?(branch_name)
branch_commit = commit(branch_name) branch_commit = commit("refs/heads/#{branch_name}")
upstream_commit = commit("refs/remotes/#{MIRROR_REMOTE}/#{branch_name}") upstream_commit = commit("refs/remotes/#{MIRROR_REMOTE}/#{branch_name}")
if upstream_commit if upstream_commit
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment