diff options
Diffstat (limited to 'internal/gitaly/service/repository/midx.go')
| -rw-r--r-- | internal/gitaly/service/repository/midx.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/internal/gitaly/service/repository/midx.go b/internal/gitaly/service/repository/midx.go index e2d899474..961e21d56 100644 --- a/internal/gitaly/service/repository/midx.go +++ b/internal/gitaly/service/repository/midx.go @@ -18,7 +18,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/internal/git/stats" "gitlab.com/gitlab-org/gitaly/v15/internal/helper" "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb" - "google.golang.org/grpc/status" ) const ( @@ -35,19 +34,16 @@ func (s *server) MidxRepack(ctx context.Context, in *gitalypb.MidxRepackRequest) repo := s.localrepo(repoProto) if err := repo.SetConfig(ctx, "core.multiPackIndex", "true", s.txManager); err != nil { - if _, ok := status.FromError(err); ok { - return nil, err - } return nil, helper.ErrInternalf("setting config: %w", err) } for _, cmd := range []midxSubCommand{s.midxWrite, s.midxExpire, s.midxRepack} { if err := s.safeMidxCommand(ctx, repoProto, cmd); err != nil { if git.IsInvalidArgErr(err) { - return nil, helper.ErrInvalidArgumentf("MidxRepack: %w", err) + return nil, helper.ErrInvalidArgument(err) } - return nil, helper.ErrInternal(fmt.Errorf("...%v", err)) + return nil, helper.ErrInternal(fmt.Errorf("...%w", err)) } } |