Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSami Hiltunen <shiltunen@gitlab.com>2020-11-18 13:11:08 +0300
committerSami Hiltunen <shiltunen@gitlab.com>2020-11-18 13:11:08 +0300
commit0eda1e7f62455c25b73e86933f3762b2a66f25f3 (patch)
tree565a3e7956154af418c2c19f037f1ba55a1e0ecd
parent8ee45d6d08e9cb9c5f44454e9ac367d72ff4558e (diff)
fix a semantic conflict with a refactoring
d205b2a0 trimmed down the git.Repository interface and exposed the concrete implementations of that interface. Some code was added during the review which was using the interface and not amended in the MR making the refactorings. This commit fixes those locations.
-rw-r--r--internal/gitaly/service/repository/fetch_remote.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/gitaly/service/repository/fetch_remote.go b/internal/gitaly/service/repository/fetch_remote.go
index 4721f8757..16d7a4fc9 100644
--- a/internal/gitaly/service/repository/fetch_remote.go
+++ b/internal/gitaly/service/repository/fetch_remote.go
@@ -230,7 +230,7 @@ func (s *server) getRefspecs(refmaps []string) []string {
return refspecs
}
-func (s *server) setRemote(ctx context.Context, repo git.Repository, name, url string) error {
+func (s *server) setRemote(ctx context.Context, repo *git.LocalRepository, name, url string) error {
if err := repo.Remote().Remove(ctx, name); err != nil {
if err != git.ErrNotFound {
return fmt.Errorf("remove remote: %w", err)
@@ -244,7 +244,7 @@ func (s *server) setRemote(ctx context.Context, repo git.Repository, name, url s
return nil
}
-func (s *server) removeRemote(ctx context.Context, repo git.Repository, name string) error {
+func (s *server) removeRemote(ctx context.Context, repo *git.LocalRepository, name string) error {
if err := repo.Remote().Remove(ctx, name); err != nil {
if err != git.ErrNotFound {
return fmt.Errorf("remove remote: %w", err)