Commit 56d131dc authored by Lin Jen-Shin's avatar Lin Jen-Shin

Use ArgumentError error instead because it's a bug

if it happens. Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747933
parent 944a8fa4
...@@ -151,17 +151,17 @@ class GitOperationService ...@@ -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
......
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