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

get rid of FileExists() check, check OpenFile() error instead

Browse Source
This commit is contained in:
risk danger olson 2016-11-29 08:20:24 -07:00
parent 3b9e629d74
commit 5444b806e3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/filetools.go
View File

@ -211,12 +211,10 @@ func fastWalkFileOrDir(parentDir string, itemFi os.FileInfo, excludeFilename str
if len(excludeFilename) > 0 {
possibleExcludeFile := filepath.Join(fullPath, excludeFilename)
if FileExists(possibleExcludeFile) {
var err error
excludePaths, err = loadExcludeFilename(possibleExcludeFile, fullPath, excludePaths)
if err != nil {
fiChan <- fastWalkInfo{Err: err}
}
var err error
excludePaths, err = loadExcludeFilename(possibleExcludeFile, fullPath, excludePaths)
if err != nil {
fiChan <- fastWalkInfo{Err: err}
}
}
@ -256,6 +254,9 @@ func fastWalkFileOrDir(parentDir string, itemFi os.FileInfo, excludeFilename str
func loadExcludeFilename(filename, parentDir string, excludePaths []filepathfilter.Pattern) ([]filepathfilter.Pattern, error) {
f, err := os.OpenFile(filename, os.O_RDONLY, 0644)
if err != nil {
if os.IsNotExist(err) {
return excludePaths, nil
}
return excludePaths, err
}
defer f.Close()