Skip to content

gitaly_client: Don't check for pre-receive-errors in merge responses

Patrick Steinhardt requested to merge pks-gitaly-merge-pre-receive-error-deprecation into master

What does this MR do and why?

Traditionally, Gitaly used to return successfully in case access checks failed for either UserMergeBranch or UserMergeToRef, but it notified the client that an error has occurred by setting the pre_receive_error field. This has been changed upstream in Gitaly:

- UserMergeBranch has been converted to make use of the rich gRPC
  error model and thus returns a proper error in case access checks
  fail.

- UserMergeToRef has been converted to not do access checks at all
  anymore.

As a result, neither of those RPCs will ever return successfully with the pre_receive_error field being set anymore. Gitaly has thus deprecated those fieilds, which will soon go away completely.

Adapt the Gitaly client to not check for these fields anymore to be prepared for the removal.

Please refer to gitaly!4393 (merged) for the upstream deprecation.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Merge request reports