From 944a8fa4d204ce7e9967f372a61657e75b4e88a0 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Wed, 14 Dec 2016 03:00:16 +0800 Subject: Use branch_exists? to check branches Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747922 --- app/services/git_operation_service.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/services') diff --git a/app/services/git_operation_service.rb b/app/services/git_operation_service.rb index 68b28231595..b00fbcf9a79 100644 --- a/app/services/git_operation_service.rb +++ b/app/services/git_operation_service.rb @@ -150,14 +150,14 @@ class GitOperationService ' :source_project is different from current project' end - unless source_project.repository.commit(source_branch_name).try(:sha) + unless source_project.repository.branch_exists?(source_branch_name) raise Repository::CommitError.new( "Cannot find branch #{branch_name} nor" \ " #{source_branch_name} from" \ " #{source_project.path_with_namespace}") end elsif source_branch_name - unless repository.commit(source_branch_name).try(:sha) + unless repository.branch_exists?(source_branch_name) raise Repository::CommitError.new( "Cannot find branch #{branch_name} nor" \ " #{source_branch_name} from" \ -- cgit v1.2.1