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

Should pass branch name, not commit object!

This commit is contained in:
Lin Jen-Shin 2016-12-10 01:23:49 +08:00
parent bb9d30590d
commit 3e01385bca
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/services/compare_service.rb
View File

@ -3,15 +3,16 @@ require 'securerandom'
# Compare 2 branches for one repo or between repositories
# and return Gitlab::Git::Compare object that responds to commits and diffs
class CompareService
attr_reader :source_project, :source_branch
attr_reader :source_project, :source_branch_name
def initialize(new_source_project, source_branch_name)
def initialize(new_source_project, new_source_branch_name)
@source_project = new_source_project
@source_branch = new_source_project.commit(source_branch_name)
@source_branch_name = new_source_branch_name
end
def execute(target_project, target_branch, straight: false)
source_sha = source_branch.try(:sha)
source_sha = source_project.repository.
commit(source_branch_name).try(:sha)
return unless source_sha
@ -20,7 +21,7 @@ class CompareService
compare(source_sha, target_project, target_branch, straight)
else
target_project.repository.with_tmp_ref(
source_project.repository, source_branch) do
source_project.repository, source_branch_name) do
compare(source_sha, target_project, target_branch, straight)
end
end