diff options
author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-01-12 10:22:51 +0300 |
---|---|---|
committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-01-14 10:19:16 +0300 |
commit | 524f38b4c7f249a84b0515f392c041d2f36a39a6 (patch) | |
tree | 52a8ffefbd1cdefd93eabc0cd26c30d45458d323 | |
parent | a4968a4410912fa547bc15276e43180353ebfd35 (diff) |
ref: Convert refsToRemove() to return ReferenceNames
Instead of returning an untyped slice of strings which represent
references, this commit refactors the `refsToRemove()` function to
return ReferenceNames instead.
-rw-r--r-- | internal/gitaly/service/ref/delete_refs.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/internal/gitaly/service/ref/delete_refs.go b/internal/gitaly/service/ref/delete_refs.go index ed1645fd9..7d4d7ef8c 100644 --- a/internal/gitaly/service/ref/delete_refs.go +++ b/internal/gitaly/service/ref/delete_refs.go @@ -33,7 +33,7 @@ func (s *server) DeleteRefs(ctx context.Context, in *gitalypb.DeleteRefsRequest) } for _, ref := range refnames { - if err := updater.Delete(ref); err != nil { + if err := updater.Delete(ref.String()); err != nil { return &gitalypb.DeleteRefsResponse{GitError: err.Error()}, nil } } @@ -45,11 +45,11 @@ func (s *server) DeleteRefs(ctx context.Context, in *gitalypb.DeleteRefsRequest) return &gitalypb.DeleteRefsResponse{}, nil } -func refsToRemove(ctx context.Context, req *gitalypb.DeleteRefsRequest) ([]string, error) { +func refsToRemove(ctx context.Context, req *gitalypb.DeleteRefsRequest) ([]git.ReferenceName, error) { if len(req.Refs) > 0 { - refs := make([]string, len(req.Refs)) + refs := make([]git.ReferenceName, len(req.Refs)) for i, ref := range req.Refs { - refs[i] = string(ref) + refs[i] = git.ReferenceName(ref) } return refs, nil } @@ -64,13 +64,13 @@ func refsToRemove(ctx context.Context, req *gitalypb.DeleteRefsRequest) ([]strin return nil, err } - var refs []string + var refs []git.ReferenceName for _, existingRef := range existingRefs { if hasAnyPrefix(existingRef.Name.String(), prefixes) { continue } - refs = append(refs, existingRef.Name.String()) + refs = append(refs, existingRef.Name) } return refs, nil |