Skip to content

Commit 781c7f5

Browse files
committed
lfs: export callback property as FoundPointer
1 parent 81d7177 commit 781c7f5

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

lfs/gitscanner.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ func IsCallbackMissing(err error) bool {
2020

2121
// GitScanner scans objects in a Git repository for LFS pointers.
2222
type GitScanner struct {
23-
Filter *filepathfilter.Filter
24-
callback GitScannerFoundPointer
25-
remote string
26-
skippedRefs []string
23+
Filter *filepathfilter.Filter
24+
FoundPointer GitScannerFoundPointer
25+
remote string
26+
skippedRefs []string
2727

2828
closed bool
2929
started time.Time
@@ -35,7 +35,7 @@ type GitScannerFoundPointer func(*WrappedPointer, error)
3535
// NewGitScanner initializes a *GitScanner for a Git repository in the current
3636
// working directory.
3737
func NewGitScanner(cb GitScannerFoundPointer) *GitScanner {
38-
return &GitScanner{started: time.Now(), callback: cb}
38+
return &GitScanner{started: time.Now(), FoundPointer: cb}
3939
}
4040

4141
// Close stops exits once all processing has stopped, and all resources are
@@ -70,7 +70,7 @@ func (s *GitScanner) RemoteForPush(r string) error {
7070
// ScanLeftToRemote scans through all commits starting at the given ref that the
7171
// given remote does not have. See RemoteForPush().
7272
func (s *GitScanner) ScanLeftToRemote(left string, cb GitScannerFoundPointer) error {
73-
callback, err := firstGitScannerCallback(cb, s.callback)
73+
callback, err := firstGitScannerCallback(cb, s.FoundPointer)
7474
if err != nil {
7575
return err
7676
}
@@ -88,7 +88,7 @@ func (s *GitScanner) ScanLeftToRemote(left string, cb GitScannerFoundPointer) er
8888
// ScanRefRange scans through all commits from the given left and right refs,
8989
// including git objects that have been modified or deleted.
9090
func (s *GitScanner) ScanRefRange(left, right string, cb GitScannerFoundPointer) error {
91-
callback, err := firstGitScannerCallback(cb, s.callback)
91+
callback, err := firstGitScannerCallback(cb, s.FoundPointer)
9292
if err != nil {
9393
return err
9494
}
@@ -107,7 +107,7 @@ func (s *GitScanner) ScanRefWithDeleted(ref string, cb GitScannerFoundPointer) e
107107
// ScanRef scans through all objects in the current ref, excluding git objects
108108
// that have been modified or deleted before the ref.
109109
func (s *GitScanner) ScanRef(ref string, cb GitScannerFoundPointer) error {
110-
callback, err := firstGitScannerCallback(cb, s.callback)
110+
callback, err := firstGitScannerCallback(cb, s.FoundPointer)
111111
if err != nil {
112112
return err
113113
}
@@ -119,7 +119,7 @@ func (s *GitScanner) ScanRef(ref string, cb GitScannerFoundPointer) error {
119119

120120
// ScanAll scans through all objects in the git repository.
121121
func (s *GitScanner) ScanAll(cb GitScannerFoundPointer) error {
122-
callback, err := firstGitScannerCallback(cb, s.callback)
122+
callback, err := firstGitScannerCallback(cb, s.FoundPointer)
123123
if err != nil {
124124
return err
125125
}
@@ -133,7 +133,7 @@ func (s *GitScanner) ScanAll(cb GitScannerFoundPointer) error {
133133
// ref. Differs from ScanRefs in that multiple files in the tree with the same
134134
// content are all reported.
135135
func (s *GitScanner) ScanTree(ref string) error {
136-
callback, err := firstGitScannerCallback(s.callback)
136+
callback, err := firstGitScannerCallback(s.FoundPointer)
137137
if err != nil {
138138
return err
139139
}
@@ -143,7 +143,7 @@ func (s *GitScanner) ScanTree(ref string) error {
143143
// ScanUnpushed scans history for all LFS pointers which have been added but not
144144
// pushed to the named remote. remote can be left blank to mean 'any remote'.
145145
func (s *GitScanner) ScanUnpushed(remote string, cb GitScannerFoundPointer) error {
146-
callback, err := firstGitScannerCallback(cb, s.callback)
146+
callback, err := firstGitScannerCallback(cb, s.FoundPointer)
147147
if err != nil {
148148
return err
149149
}
@@ -155,7 +155,7 @@ func (s *GitScanner) ScanUnpushed(remote string, cb GitScannerFoundPointer) erro
155155
// Does not include pointers which were still in use at ref (use ScanRefsToChan
156156
// for that)
157157
func (s *GitScanner) ScanPreviousVersions(ref string, since time.Time, cb GitScannerFoundPointer) error {
158-
callback, err := firstGitScannerCallback(cb, s.callback)
158+
callback, err := firstGitScannerCallback(cb, s.FoundPointer)
159159
if err != nil {
160160
return err
161161
}
@@ -164,7 +164,7 @@ func (s *GitScanner) ScanPreviousVersions(ref string, since time.Time, cb GitSca
164164

165165
// ScanIndex scans the git index for modified LFS objects.
166166
func (s *GitScanner) ScanIndex(ref string, cb GitScannerFoundPointer) error {
167-
callback, err := firstGitScannerCallback(cb, s.callback)
167+
callback, err := firstGitScannerCallback(cb, s.FoundPointer)
168168
if err != nil {
169169
return err
170170
}

0 commit comments

Comments
 (0)