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

Use branch_exists? to check branches

Browse source 
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747922
This commit is contained in:
Lin Jen-Shin 2016-12-14 03:00:16 +08:00
parent d03c605bd4
commit 944a8fa4d2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/services/git_operation_service.rb
View file

@ -150,14 +150,14 @@ class GitOperationService
' :source_project is different from current project' ' :source_project is different from current project'
end end
unless source_project.repository.commit(source_branch_name).try(:sha) unless source_project.repository.branch_exists?(source_branch_name)
raise Repository::CommitError.new( raise Repository::CommitError.new(
"Cannot find branch #{branch_name} nor" \ "Cannot find branch #{branch_name} nor" \
" #{source_branch_name} from" \ " #{source_branch_name} from" \
" #{source_project.path_with_namespace}") " #{source_project.path_with_namespace}")
end end
elsif source_branch_name elsif source_branch_name
unless repository.commit(source_branch_name).try(:sha) unless repository.branch_exists?(source_branch_name)
raise Repository::CommitError.new( raise Repository::CommitError.new(
"Cannot find branch #{branch_name} nor" \ "Cannot find branch #{branch_name} nor" \
" #{source_branch_name} from" \ " #{source_branch_name} from" \