lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2851 from git-lfs/lars/prune-excluded

Browse Source 
prune: always prune excluded paths
This commit is contained in:
Taylor Blau 2018-02-13 17:52:14 -08:00 committed by GitHub
commit 8eeaa8d889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
commands/command_prune.go
View File

@ -7,6 +7,7 @@ import (
"sync"
"time"
"github.com/git-lfs/git-lfs/filepathfilter"
"github.com/git-lfs/git-lfs/fs"
"github.com/git-lfs/git-lfs/git"
"github.com/git-lfs/git-lfs/lfs"
@ -86,6 +87,8 @@ func prune(fetchPruneConfig lfs.FetchPruneConfig, verifyRemote, dryRun, verbose
retainChan := make(chan string, 100)
gitscanner := lfs.NewGitScanner(nil)
gitscanner.Filter = filepathfilter.New(nil, cfg.FetchExcludePaths())
go pruneTaskGetRetainedCurrentAndRecentRefs(gitscanner, fetchPruneConfig, retainChan, errorChan, &taskwait)
go pruneTaskGetRetainedUnpushed(gitscanner, fetchPruneConfig, retainChan, errorChan, &taskwait)
go pruneTaskGetRetainedWorktree(gitscanner, retainChan, errorChan, &taskwait)
@ -344,10 +347,10 @@ func pruneTaskGetPreviousVersionsOfRef(gitscanner *lfs.GitScanner, ref string, s
if err != nil {
errorChan <- err
return
} else {
retainChan <- p.Oid
tracerx.Printf("RETAIN: %v via ref %v >= %v", p.Oid, ref, since)
}
retainChan <- p.Oid
tracerx.Printf("RETAIN: %v via ref %v >= %v", p.Oid, ref, since)
})
if err != nil {