diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-06-14 12:42:22 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-06-15 09:46:59 +0300 |
| commit | ba8202022606baa73e8ddde68d11a386a1ae4b64 (patch) | |
| tree | a6d09e85e26396cbc149a77c113a2a318e40f0ca /ruby/proto | |
| parent | c0cc066c9356682d1ed7fb60b2fa42bbbe010d4e (diff) | |
operations: Return structured errors on conflict in UserMergeBranch
While we already handle some of the errors in UserMergeBranch specially
via structured errors, we don't yet do so for merge conflicts. Amend
this error handling so that callers can know that the error is indeed
caused by a merge conflict, and so that they can find our exactly which
files have been conflicting.
Note that this is not done behind a feature flag: there aren't any
callers which parse the error, and neither should there be any. So given
that we retain the same error code as before but only amend the error
message and add some error details this should not be a breaking change.
Changelog: added
Diffstat (limited to 'ruby/proto')
| -rw-r--r-- | ruby/proto/gitaly/operations_pb.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ruby/proto/gitaly/operations_pb.rb b/ruby/proto/gitaly/operations_pb.rb index 6671a0e4c..e5954d7c4 100644 --- a/ruby/proto/gitaly/operations_pb.rb +++ b/ruby/proto/gitaly/operations_pb.rb @@ -83,6 +83,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :access_check, :message, 1, "gitaly.AccessCheckError" optional :reference_update, :message, 2, "gitaly.ReferenceUpdateError" optional :custom_hook, :message, 3, "gitaly.CustomHookError" + optional :merge_conflict, :message, 4, "gitaly.MergeConflictError" end end add_message "gitaly.UserMergeToRefRequest" do |