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:
authorJacob Vosmaer <jacob@gitlab.com>2019-08-22 13:51:52 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2019-08-22 13:51:52 +0300
commitd3183b67f0d07b20dd7680432333037a2f581345 (patch)
tree5966c0a6b227879f3364413ed768477e1d7d645e /internal/git
parent46d56dcbe7e01100d9f1df4bb5cc49b87e905f49 (diff)
Small fixes for GetAllLFSPointers
Diffstat (limited to 'internal/git')
-rw-r--r--internal/git/catfile/batch.go2
-rw-r--r--internal/git/catfile/batchcheck.go2
-rw-r--r--internal/git/catfile/objectinfo.go4
-rw-r--r--internal/git/catfile/parse_test.go4
4 files changed, 5 insertions, 7 deletions
diff --git a/internal/git/catfile/batch.go b/internal/git/catfile/batch.go
index 5bb4e5c65..737a651ac 100644
--- a/internal/git/catfile/batch.go
+++ b/internal/git/catfile/batch.go
@@ -79,7 +79,7 @@ func (b *batchProcess) reader(revspec string, expectedType string) (io.Reader, e
return nil, err
}
- oi, err := parseObjectInfo(b.r)
+ oi, err := ParseObjectInfo(b.r)
if err != nil {
return nil, err
}
diff --git a/internal/git/catfile/batchcheck.go b/internal/git/catfile/batchcheck.go
index 199341656..3734e2293 100644
--- a/internal/git/catfile/batchcheck.go
+++ b/internal/git/catfile/batchcheck.go
@@ -51,5 +51,5 @@ func (bc *batchCheck) info(spec string) (*ObjectInfo, error) {
return nil, err
}
- return parseObjectInfo(bc.r)
+ return ParseObjectInfo(bc.r)
}
diff --git a/internal/git/catfile/objectinfo.go b/internal/git/catfile/objectinfo.go
index de296287d..ebf63cc4f 100644
--- a/internal/git/catfile/objectinfo.go
+++ b/internal/git/catfile/objectinfo.go
@@ -29,9 +29,7 @@ func (o *ObjectInfo) IsBlob() bool {
}
// ParseObjectInfo reads from a reader and parses the data into an ObjectInfo struct
-var ParseObjectInfo = parseObjectInfo
-
-func parseObjectInfo(stdout *bufio.Reader) (*ObjectInfo, error) {
+func ParseObjectInfo(stdout *bufio.Reader) (*ObjectInfo, error) {
infoLine, err := stdout.ReadString('\n')
if err != nil {
return nil, fmt.Errorf("read info line: %v", err)
diff --git a/internal/git/catfile/parse_test.go b/internal/git/catfile/parse_test.go
index 60b0092c4..46e9b39e2 100644
--- a/internal/git/catfile/parse_test.go
+++ b/internal/git/catfile/parse_test.go
@@ -34,7 +34,7 @@ func TestParseObjectInfoSuccess(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.desc, func(t *testing.T) {
reader := bufio.NewReader(strings.NewReader(tc.input))
- output, err := parseObjectInfo(reader)
+ output, err := ParseObjectInfo(reader)
if tc.notFound {
require.True(t, IsNotFound(err), "expect NotFoundError")
return
@@ -60,7 +60,7 @@ func TestParseObjectInfoErrors(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.desc, func(t *testing.T) {
reader := bufio.NewReader(strings.NewReader(tc.input))
- _, err := parseObjectInfo(reader)
+ _, err := ParseObjectInfo(reader)
require.Error(t, err)
})