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, 1 insertions, 2 deletions
diff --git a/internal/gitaly/service/conflicts/list_conflict_files.go b/internal/gitaly/service/conflicts/list_conflict_files.go index 51189d554..f76ae528b 100644 --- a/internal/gitaly/service/conflicts/list_conflict_files.go +++ b/internal/gitaly/service/conflicts/list_conflict_files.go @@ -8,7 +8,6 @@ import ( "unicode/utf8" "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/localrepo" "gitlab.com/gitlab-org/gitaly/internal/git2go" "gitlab.com/gitlab-org/gitaly/internal/helper" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" @@ -22,7 +21,7 @@ func (s *server) ListConflictFiles(request *gitalypb.ListConflictFilesRequest, s return helper.ErrInvalidArgument(err) } - repo := localrepo.New(s.gitCmdFactory, request.Repository, s.cfg) + repo := s.localrepo(request.GetRepository()) ours, err := repo.ResolveRevision(ctx, git.Revision(request.OurCommitOid+"^{commit}")) if err != nil { |