Commit 23032467 authored by Lin Jen-Shin's avatar Lin Jen-Shin

source_branch -> source_branch_name

parent 3fa3fcd7
...@@ -134,27 +134,28 @@ GitOperationService = Struct.new(:user, :repository) do ...@@ -134,27 +134,28 @@ GitOperationService = Struct.new(:user, :repository) do
end end
end end
def check_with_branch_arguments!(branch_name, source_branch, source_project) def check_with_branch_arguments!(
branch_name, source_branch_name, source_project)
return if repository.branch_exists?(branch_name) return if repository.branch_exists?(branch_name)
if repository.project != source_project if repository.project != source_project
unless source_branch unless source_branch_name
raise ArgumentError, raise ArgumentError,
'Should also pass :source_branch if' + 'Should also pass :source_branch_name if' +
' :source_project is different from current project' ' :source_project is different from current project'
end end
unless source_project.repository.commit(source_branch).try(:sha) unless source_project.repository.commit(source_branch_name).try(:sha)
raise Repository::CommitError.new( raise Repository::CommitError.new(
"Cannot find branch #{branch_name} nor" \ "Cannot find branch #{branch_name} nor" \
" #{source_branch} from" \ " #{source_branch_name} from" \
" #{source_project.path_with_namespace}") " #{source_project.path_with_namespace}")
end end
elsif source_branch elsif source_branch_name
unless repository.commit(source_branch).try(:sha) unless repository.commit(source_branch_name).try(:sha)
raise Repository::CommitError.new( raise Repository::CommitError.new(
"Cannot find branch #{branch_name} nor" \ "Cannot find branch #{branch_name} nor" \
" #{source_branch} from" \ " #{source_branch_name} from" \
" #{repository.project.path_with_namespace}") " #{repository.project.path_with_namespace}")
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