diff options
Diffstat (limited to 'internal/gitaly/service/repository/merge_base.go')
| -rw-r--r-- | internal/gitaly/service/repository/merge_base.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/gitaly/service/repository/merge_base.go b/internal/gitaly/service/repository/merge_base.go index 07f284cdd..52653d150 100644 --- a/internal/gitaly/service/repository/merge_base.go +++ b/internal/gitaly/service/repository/merge_base.go @@ -2,7 +2,7 @@ package repository import ( "context" - "io/ioutil" + "io" "gitlab.com/gitlab-org/gitaly/v14/internal/git" "gitlab.com/gitlab-org/gitaly/v14/internal/helper/text" @@ -34,7 +34,7 @@ func (s *server) FindMergeBase(ctx context.Context, req *gitalypb.FindMergeBaseR return nil, status.Errorf(codes.Internal, "FindMergeBase: cmd: %v", err) } - mergeBase, err := ioutil.ReadAll(cmd) + mergeBase, err := io.ReadAll(cmd) if err != nil { return nil, err } |