diff options
-rw-r--r-- | internal/git/catfile/batch.go | 2 | ||||
-rw-r--r-- | internal/git/catfile/batchcheck.go | 2 | ||||
-rw-r--r-- | internal/git/catfile/objectinfo.go | 4 | ||||
-rw-r--r-- | internal/git/catfile/parse_test.go | 4 | ||||
-rw-r--r-- | internal/service/blob/lfs_pointers.go | 16 |
5 files changed, 17 insertions, 11 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) }) diff --git a/internal/service/blob/lfs_pointers.go b/internal/service/blob/lfs_pointers.go index fb45a5859..5d1e7d4ae 100644 --- a/internal/service/blob/lfs_pointers.go +++ b/internal/service/blob/lfs_pointers.go @@ -203,7 +203,15 @@ func getAllLFSPointersRubyScript(repository *gitalypb.Repository, stream gitalyp ctx := stream.Context() - cmd := exec.Command("ruby", "--", "-", repoPath, fmt.Sprintf("%d", LfsPointerMinSize), fmt.Sprintf("%d", LfsPointerMaxSize)) + cmd := exec.Command( + "ruby", + "--", + "-", + config.Config.Git.BinPath, + repoPath, + fmt.Sprintf("%d", LfsPointerMinSize), + fmt.Sprintf("%d", LfsPointerMaxSize), + ) cmd.Dir = config.Config.Ruby.Dir ruby, err := command.New(ctx, cmd, strings.NewReader(rubyScript), nil, nil, os.Environ()...) if err != nil { @@ -269,8 +277,8 @@ func parseCatfileOut(_r io.Reader, stream gitalypb.BlobService_GetAllLFSPointers var rubyScript = ` -def main(git_dir, minSize, maxSize) - IO.popen(%W[git -C #{git_dir} rev-list --all --filter=blob:limit=#{maxSize+1} --in-commit-order --objects], 'r') do |rev_list| +def main(git_bin, git_dir, minSize, maxSize) + IO.popen(%W[#{git_bin} -C #{git_dir} rev-list --all --filter=blob:limit=#{maxSize+1} --in-commit-order --objects], 'r') do |rev_list| # Loading bundler and rugged is slow. Let's do it while we wait for git rev-list. require 'bundler/setup' require 'rugged' @@ -293,5 +301,5 @@ def main(git_dir, minSize, maxSize) abort 'rev-list failed' unless $?.success? end -main(ARGV[0], Integer(ARGV[1]), Integer(ARGV[2])) +main(ARGV[0], ARGV[1], Integer(ARGV[2]), Integer(ARGV[3])) ` |