Skip to content

Revert "Merge branch 'pks-revert-delete-refs-fix' into 'master'"

John Cai requested to merge jc-restore-99b5528b6 into master

This reverts commit e49ea295, reversing changes made to 99b5528b.

!4897 (merged) updated DeleteRefs to always return a structured error in the prepare stage. There was a case when we were still returning nil for error, and embedding the error into the response.

However, this ended up breaking QA: https://gitlab.com/gitlab-org/gitlab/-/jobs/3148462446. The reason this broke the test was because the test was expecting that a ref with a backslash eg: refs\heads\master was returning an error in the response. With the change in !4897 (merged), we started to return an actual gRPC error in the prepare stage of update-refs.

This failure mode however, should really be caught earlier in DeleteRefs where we validate the refs.

!4921 (merged) accomplishes this. But, we also needed to change the spec to expect both types of errors in the interim until !4921 (merged) is merged and included in GITALY_SERVER_VERSION on the gitlab project.

So, before this MR is merged, the following needs to occur:

  1. gitlab!100605 (merged) is merged
  2. !4921 (merged) is merged
Edited by John Cai

Merge request reports