diff options
Diffstat (limited to 'internal/gitaly/service/conflicts/list_conflict_files.go')
| -rw-r--r-- | internal/gitaly/service/conflicts/list_conflict_files.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/gitaly/service/conflicts/list_conflict_files.go b/internal/gitaly/service/conflicts/list_conflict_files.go index c0316e5eb..427603524 100644 --- a/internal/gitaly/service/conflicts/list_conflict_files.go +++ b/internal/gitaly/service/conflicts/list_conflict_files.go @@ -7,6 +7,7 @@ import ( "io" "unicode/utf8" + gitalyerrors "gitlab.com/gitlab-org/gitaly/v15/internal/errors" "gitlab.com/gitlab-org/gitaly/v15/internal/git" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" "gitlab.com/gitlab-org/gitaly/v15/internal/helper" @@ -127,7 +128,7 @@ func (s *server) ListConflictFiles(request *gitalypb.ListConflictFilesRequest, s func validateListConflictFilesRequest(in *gitalypb.ListConflictFilesRequest) error { if in.GetRepository() == nil { - return fmt.Errorf("empty Repository") + return gitalyerrors.ErrEmptyRepository } if in.GetOurCommitOid() == "" { return fmt.Errorf("empty OurCommitOid") |