diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-12-22 16:58:05 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-01-03 12:02:37 +0100 |
| commit | 8cf0ea4469290815daa1d64c4f3e16cbba8c00c1 (patch) | |
| tree | a82a85ea9dbe7bba6efa9f196f85c238eb3dd14d /lib | |
| parent | 48dacd5e74d17db6c058ea79301d237330980b0e (diff) | |
| download | gitlab-ce-8cf0ea4469290815daa1d64c4f3e16cbba8c00c1.tar.gz | |
Handle Gitaly aborted merge due to branch update
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gitaly_client/operation_service.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client/operation_service.rb b/lib/gitlab/gitaly_client/operation_service.rb index c7732764880..ae1753ff0ae 100644 --- a/lib/gitlab/gitaly_client/operation_service.rb +++ b/lib/gitlab/gitaly_client/operation_service.rb @@ -101,6 +101,7 @@ module Gitlab request_enum.push(Gitaly::UserMergeBranchRequest.new(apply: true)) branch_update = response_enum.next.branch_update + return if branch_update.nil? raise Gitlab::Git::CommitError.new('failed to apply merge to branch') unless branch_update.commit_id.present? Gitlab::Git::OperationService::BranchUpdate.from_gitaly(branch_update) |