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

Add better error reporting to gitignore loading & derive parent correctly

Browse Source
This commit is contained in:
Steve Streeting 2016-11-01 10:24:55 +00:00
parent 546d6ad603
commit 55cb397acf
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/filetools.go
View File

@ -273,7 +273,11 @@ func fastWalkItem(parentDir string, itemFi os.FileInfo, excludeFilename string,
if len(excludeFilename) > 0 { if len(excludeFilename) > 0 {
possibleExcludeFile := filepath.Join(fullPath, excludeFilename) possibleExcludeFile := filepath.Join(fullPath, excludeFilename)
if FileExists(possibleExcludeFile) { if FileExists(possibleExcludeFile) {
excludePaths = loadExcludeFilename(possibleExcludeFile, excludePaths) var err error
excludePaths, err = loadExcludeFilename(possibleExcludeFile, fullPath, excludePaths)
if err != nil {
errChan <- err
}
} }
} }
@ -309,17 +313,16 @@ func fastWalkItem(parentDir string, itemFi os.FileInfo, excludeFilename string,
// revised array of exclude paths if there are any changes. // revised array of exclude paths if there are any changes.
// If any changes are made a copy of the array is taken so the original is not // If any changes are made a copy of the array is taken so the original is not
// modified // modified
func loadExcludeFilename(filename string, excludePaths []string) []string { func loadExcludeFilename(filename, parentDir string, excludePaths []string) ([]string, error) {
f, err := os.OpenFile(filename, os.O_RDONLY, 0644) f, err := os.OpenFile(filename, os.O_RDONLY, 0644)
if err != nil { if err != nil {
return excludePaths return excludePaths, err
} }
defer f.Close() defer f.Close()
retPaths := excludePaths retPaths := excludePaths
modified := false modified := false
parentDir := filepath.Dir(filename)
scanner := bufio.NewScanner(f) scanner := bufio.NewScanner(f)
for scanner.Scan() { for scanner.Scan() {
@ -341,6 +344,6 @@ func loadExcludeFilename(filename string, excludePaths []string) []string {
retPaths = append(retPaths, path) retPaths = append(retPaths, path)
} }
return retPaths return retPaths, nil
} }