Skip to content

Commit 2d36bf7

Browse files
committed
use IsObjectExist instead
Signed-off-by: Andrew Thornton <[email protected]>
1 parent 4130d88 commit 2d36bf7

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

services/repository/lfs.go

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package repository
55

66
import (
77
"context"
8-
"errors"
98
"fmt"
109

1110
"code.gitea.io/gitea/models/db"
@@ -58,28 +57,16 @@ func GarbageCollectLFSMetaObjectsForRepo(ctx context.Context, repo *repo_model.R
5857
return err
5958
}
6059
defer gitRepo.Close()
61-
checkWr, checkRd, cancel := gitRepo.CatFileBatchCheck(ctx)
62-
defer cancel()
6360

6461
store := lfs.NewContentStore()
6562

6663
return git_model.IterateLFSMetaObjectsForRepo(ctx, repo.ID, func(ctx context.Context, metaObject *git_model.LFSMetaObject, count int64) error {
6764
total++
6865
pointerSha := git.ComputeBlobHash([]byte(metaObject.Pointer.StringContent()))
69-
_, err := checkWr.Write([]byte(pointerSha.String()))
70-
if err != nil {
71-
return fmt.Errorf("unable to write pointerSHA to cat-file in %s: %w", repo.FullName(), err)
72-
}
7366

74-
_, _, _, err = git.ReadBatchLine(checkRd)
75-
if err == nil {
67+
if gitRepo.IsObjectExist(pointerSha.String()) {
7668
return nil
7769
}
78-
79-
if !errors.Is(err, git.ErrNotExist{}) {
80-
return fmt.Errorf("unable to read pointerSHA from cat-file in %s: %w", repo.FullName(), err)
81-
}
82-
8370
orphaned++
8471

8572
if !autofix {

0 commit comments

Comments
 (0)