diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-08-30 14:40:50 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-08-30 14:40:50 +0300 |
| commit | feb5524844effdb8a379bd23b26fa1d8e4450986 (patch) | |
| tree | 68f1dde4471f32440301e76db7260f9239057af4 | |
| parent | 77d5d03d4df12c3dacc0cb5a05a74f9abb1cc6ef (diff) | |
operations: Remove check for Git2go errors in UserMergeToRef
The UserMergeToRef RPC still checks for `git2go.ErrInvalidArgument`
errors even though it doesn't even execute gitaly-git2go anymore. Drop
that check.
| -rw-r--r-- | internal/gitaly/service/operations/merge_to_ref.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/internal/gitaly/service/operations/merge_to_ref.go b/internal/gitaly/service/operations/merge_to_ref.go index cf6444fc1..d04566c39 100644 --- a/internal/gitaly/service/operations/merge_to_ref.go +++ b/internal/gitaly/service/operations/merge_to_ref.go @@ -9,7 +9,6 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git2go" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" @@ -114,9 +113,6 @@ func (s *Server) UserMergeToRef(ctx context.Context, request *gitalypb.UserMerge }, ).Error("unable to create merge commit") - if errors.Is(err, git2go.ErrInvalidArgument) { - return nil, structerr.NewInvalidArgument("%w", err) - } return nil, structerr.NewFailedPrecondition("Failed to create merge commit for source_sha %s and target_sha %s at %s", sourceOID, oid, string(request.TargetRef)) } |