diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-12-14 17:42:29 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-12-15 08:40:19 +0300 |
| commit | 0d0d6986b3f40c6faabfc1eaee33feb548987d7c (patch) | |
| tree | bc9c70a5085b808fae50f11bacaaf76a832eae6f /cmd | |
| parent | 0a6d84047c1d5da0d9557b295e62d13580af77c1 (diff) | |
helper: Convert `ErrFailedPreconditionf()` callers
Convert callers of `ErrFailedPreconditionf()` to instead use the
`structerr` package and remove the now-unused function.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gitaly-git2go/conflicts.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/gitaly-git2go/conflicts.go b/cmd/gitaly-git2go/conflicts.go index 1970a2644..6ee5d8125 100644 --- a/cmd/gitaly-git2go/conflicts.go +++ b/cmd/gitaly-git2go/conflicts.go @@ -12,7 +12,7 @@ import ( git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" - "gitlab.com/gitlab-org/gitaly/v15/internal/helper" + "gitlab.com/gitlab-org/gitaly/v15/internal/structerr" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -114,7 +114,7 @@ func Merge(repo *git.Repository, conflict git.IndexConflict) (*git.MergeFileResu blob, err := repo.LookupBlob(entry.Id) if err != nil { - return nil, helper.ErrFailedPreconditionf("could not get conflicting blob: %w", err) + return nil, structerr.NewFailedPrecondition("could not get conflicting blob: %w", err) } input.Path = entry.Path |