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

This reverts commit e49ea29543b2d8e71bfe4bdc3b295f785bd24fb1, reversing
changes made to 99b5528b66b23c1a8399027ecdef306267e668ae.

1 files changed, 17 insertions, 14 deletions

diff --git a/internal/gitaly/service/ref/delete_refs.go b/internal/gitaly/service/ref/delete_refs.go
index f8d7a7f03..0e92ffc84 100644
--- a/internal/gitaly/service/ref/delete_refs.go
+++ b/internal/gitaly/service/ref/delete_refs.go
@@ -83,24 +83,27 @@ func (s *server) DeleteRefs(ctx context.Context, in *gitalypb.DeleteRefsRequest)
 	}
 
 	if err := updater.Prepare(); err != nil {
-		var errAlreadyLocked *updateref.ErrAlreadyLocked
-		if featureflag.DeleteRefsStructuredErrors.IsEnabled(ctx) &&
-			errors.As(err, &errAlreadyLocked) {
-			detailedErr, err := helper.ErrWithDetails(
-				helper.ErrFailedPreconditionf("cannot lock references"),
-				&gitalypb.DeleteRefsError{
-					Error: &gitalypb.DeleteRefsError_ReferencesLocked{
-						ReferencesLocked: &gitalypb.ReferencesLockedError{
-							Refs: [][]byte{[]byte(errAlreadyLocked.Ref)},
+		if featureflag.DeleteRefsStructuredErrors.IsEnabled(ctx) {
+			var errAlreadyLocked *updateref.ErrAlreadyLocked
+			if errors.As(err, &errAlreadyLocked) {
+				detailedErr, err := helper.ErrWithDetails(
+					helper.ErrFailedPreconditionf("cannot lock references"),
+					&gitalypb.DeleteRefsError{
+						Error: &gitalypb.DeleteRefsError_ReferencesLocked{
+							ReferencesLocked: &gitalypb.ReferencesLockedError{
+								Refs: [][]byte{[]byte(errAlreadyLocked.Ref)},
+							},
 						},
 					},
-				},
-			)
-			if err != nil {
-				return nil, helper.ErrInternalf("error details: %w", err)
+				)
+				if err != nil {
+					return nil, helper.ErrInternalf("error details: %w", err)
+				}
+
+				return nil, detailedErr
 			}
 
-			return nil, detailedErr
+			return nil, helper.ErrInternalf("unable to prepare: %w", err)
 		}
 
 		return &gitalypb.DeleteRefsResponse{