Revert "Merge branch 'jc-fix-delete-refs' into 'master'"revert-99b5528b

This reverts merge request !4897

1 files changed, 14 insertions, 17 deletions

diff --git a/internal/gitaly/service/ref/delete_refs.go b/internal/gitaly/service/ref/delete_refs.go
index 0e92ffc84..f8d7a7f03 100644
--- a/internal/gitaly/service/ref/delete_refs.go
+++ b/internal/gitaly/service/ref/delete_refs.go
@@ -83,27 +83,24 @@ func (s *server) DeleteRefs(ctx context.Context, in *gitalypb.DeleteRefsRequest)
 	}
 
 	if err := updater.Prepare(); err != nil {
-		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)},
-							},
+		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 err != nil {
-					return nil, helper.ErrInternalf("error details: %w", err)
-				}
-
-				return nil, detailedErr
+				},
+			)
+			if err != nil {
+				return nil, helper.ErrInternalf("error details: %w", err)
 			}
 
-			return nil, helper.ErrInternalf("unable to prepare: %w", err)
+			return nil, detailedErr
 		}
 
 		return &gitalypb.DeleteRefsResponse{