diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-20 10:00:05 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-22 08:49:45 +0300 |
| commit | 9916df2ed49ae671c99af554d0d2f6112a16ebf0 (patch) | |
| tree | 79bddd2baf55024707a06a57538427d3a2ee0eed | |
| parent | e480e1b72268b7b0ad47e0828a03c47dc27b0083 (diff) | |
conflicts: Convert `sameRepo()` to accept GitRepo interfaces
The `sameRepo()` function is currently working on `*gitalypb.Repository`
structures, but in fact it works perfectly fine if only given two
`repository.GitRepo` interfaces.
Convert it to accept the interfaces to make it more flexible.
| -rw-r--r-- | internal/gitaly/service/conflicts/resolve_conflicts.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/gitaly/service/conflicts/resolve_conflicts.go b/internal/gitaly/service/conflicts/resolve_conflicts.go index 91c7ebb01..3d872253e 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts.go @@ -17,6 +17,7 @@ import ( "gitlab.com/gitlab-org/gitaly/internal/git/conflict" "gitlab.com/gitlab-org/gitaly/internal/git/localrepo" "gitlab.com/gitlab-org/gitaly/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/internal/git/repository" "gitlab.com/gitlab-org/gitaly/internal/git2go" "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" "gitlab.com/gitlab-org/gitaly/internal/gitalyssh" @@ -246,7 +247,7 @@ func (s *server) resolveConflicts(header *gitalypb.ResolveConflictsRequestHeader return nil } -func sameRepo(left, right *gitalypb.Repository) bool { +func sameRepo(left, right repository.GitRepo) bool { lgaod := left.GetGitAlternateObjectDirectories() rgaod := right.GetGitAlternateObjectDirectories() if len(lgaod) != len(rgaod) { |