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

Use ArgumentError error instead because it's a bug

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

8
app/services/git_operation_service.rb
View file

@ -151,17 +151,17 @@ class GitOperationService
end end
unless source_project.repository.branch_exists?(source_branch_name) unless source_project.repository.branch_exists?(source_branch_name)
raise Repository::CommitError.new( raise ArgumentError,
"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.branch_exists?(source_branch_name) unless repository.branch_exists?(source_branch_name)
raise Repository::CommitError.new( raise ArgumentError,
"Cannot find branch #{branch_name} nor" \ "Cannot find branch #{branch_name} nor" \
" #{source_branch_name} from" \ " #{source_branch_name} from" \
" #{repository.project.path_with_namespace}") " #{repository.project.path_with_namespace}"
end end
end end
end end