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:
authorKarthik Nayak <knayak@gitlab.com>2022-11-07 16:35:52 +0300
committerKarthik Nayak <knayak@gitlab.com>2022-11-14 12:12:29 +0300
commit97035c50b916e046697a7945a3ac6c65fafc32a1 (patch)
treee2df3c2d1da2b89937a5f5292e850e62d527b9c9 /internal/gitaly/service/repository/apply_gitattributes.go
parent72e7146efcd3cfacfc0b1a1f0f949bd0f0e59aac (diff)
catfile: Rename ObjectReader to ObjectContentReader
Rename the file/functions pertaining to ObjectReader to ObjectContentReader. This is in preparation of the upcoming patches wherein we will introduce a new ObjectReader which will satisfy both the interfaces of the current ObjectReader and ObjectInfoReader. To avoid the clash of naming, we shall rename the current ObjectReader to ObjectContentReader. Eventually we will delete both ObjectContentReader and ObjectInfoReader.
Diffstat (limited to 'internal/gitaly/service/repository/apply_gitattributes.go')
-rw-r--r--internal/gitaly/service/repository/apply_gitattributes.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/gitaly/service/repository/apply_gitattributes.go b/internal/gitaly/service/repository/apply_gitattributes.go
index 4c1e436bf..a06b32e1a 100644
--- a/internal/gitaly/service/repository/apply_gitattributes.go
+++ b/internal/gitaly/service/repository/apply_gitattributes.go
@@ -23,7 +23,7 @@ import (
const attributesFileMode os.FileMode = 0o644
-func (s *server) applyGitattributes(ctx context.Context, repo *localrepo.Repo, objectReader catfile.ObjectReader, repoPath string, revision []byte) (returnedErr error) {
+func (s *server) applyGitattributes(ctx context.Context, repo *localrepo.Repo, objectReader catfile.ObjectContentReader, repoPath string, revision []byte) (returnedErr error) {
infoPath := filepath.Join(repoPath, "info")
attributesPath := filepath.Join(infoPath, "attributes")