Commit 3e01385b authored by Lin Jen-Shin's avatar Lin Jen-Shin

Should pass branch name, not commit object!

parent bb9d3059
...@@ -3,15 +3,16 @@ require 'securerandom' ...@@ -3,15 +3,16 @@ require 'securerandom'
# Compare 2 branches for one repo or between repositories # Compare 2 branches for one repo or between repositories
# and return Gitlab::Git::Compare object that responds to commits and diffs # and return Gitlab::Git::Compare object that responds to commits and diffs
class CompareService 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_project = new_source_project
@source_branch = new_source_project.commit(source_branch_name) @source_branch_name = new_source_branch_name
end end
def execute(target_project, target_branch, straight: false) 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 return unless source_sha
...@@ -20,7 +21,7 @@ class CompareService ...@@ -20,7 +21,7 @@ class CompareService
compare(source_sha, target_project, target_branch, straight) compare(source_sha, target_project, target_branch, straight)
else else
target_project.repository.with_tmp_ref( 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) compare(source_sha, target_project, target_branch, straight)
end end
end end
......
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