From 56d131dcd52cba98e0eee253cab8bbf0b3b706df Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Wed, 14 Dec 2016 03:03:20 +0800 Subject: [PATCH] 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 --- app/services/git_operation_service.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/services/git_operation_service.rb b/app/services/git_operation_service.rb index b00fbcf9a79..0d1bd05e552 100644 --- a/app/services/git_operation_service.rb +++ b/app/services/git_operation_service.rb @@ -151,17 +151,17 @@ class GitOperationService end unless source_project.repository.branch_exists?(source_branch_name) - raise Repository::CommitError.new( + raise ArgumentError, "Cannot find branch #{branch_name} nor" \ " #{source_branch_name} from" \ - " #{source_project.path_with_namespace}") + " #{source_project.path_with_namespace}" end elsif source_branch_name unless repository.branch_exists?(source_branch_name) - raise Repository::CommitError.new( + raise ArgumentError, "Cannot find branch #{branch_name} nor" \ " #{source_branch_name} from" \ - " #{repository.project.path_with_namespace}") + " #{repository.project.path_with_namespace}" end end end