lfs/gitscanner: support gitscanner.Filter in more places

Author: ttaylorr

lfs/gitscanner.go

@@ -175,7 +175,7 @@ func (s *GitScanner) ScanIndex(ref string, cb GitScannerFoundPointer) error {
 	if err != nil {
 		return err
 	}
-	return scanIndex(callback, ref)
+	return scanIndex(callback, ref, s.Filter)
 }
 
 func (s *GitScanner) opts(mode ScanningMode) *ScanRefsOptions {

lfs/gitscanner_index.go

@@ -3,14 +3,16 @@ package lfs
 import (
 	"strings"
 	"sync"
+
+	"github.com/git-lfs/git-lfs/filepathfilter"
 )
 
 // ScanIndex returns a slice of WrappedPointer objects for all Git LFS pointers
 // it finds in the index.
 //
 // Ref is the ref at which to scan, which may be "HEAD" if there is at least one
 // commit.
-func scanIndex(cb GitScannerFoundPointer, ref string) error {
+func scanIndex(cb GitScannerFoundPointer, ref string, f *filepathfilter.Filter) error {
 	indexMap := &indexFileMap{
 		nameMap:      make(map[string][]*indexFile),
 		nameShaPairs: make(map[string]bool),
@@ -95,7 +97,9 @@ func scanIndex(cb GitScannerFoundPointer, ref string) error {
 	}()
 
 	for result := range ch {
-		cb(result.Pointer, result.Err)
+		if f.Allows(result.Pointer.Name) {
+			cb(result.Pointer, result.Err)
+		}
 	}
 
 	return nil

lfs/gitscanner_refs.go

@@ -72,11 +72,16 @@ func scanRefsToChan(scanner *GitScanner, pointerCb GitScannerFoundPointer, refLe
 		if name, ok := opt.GetName(p.Sha1); ok {
 			p.Name = name
 		}
-		pointerCb(p, nil)
+
+		if scanner.Filter.Allows(p.Name) {
+			pointerCb(p, nil)
+		}
 	}
 
 	for lockableName := range checkLockableCh {
-		lockableCb(lockableName)
+		if scanner.Filter.Allows(lockableName) {
+			lockableCb(lockableName)
+		}
 	}
 
 	if err := pointers.Wait(); err != nil {