Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #850 from AudriusButkevicius/nil 

Do not return nil pointers when loading ignores (fixes #846)
This commit is contained in:
Audrius Butkevicius 2014-10-14 19:16:20 +01:00
parent 964d17d05a 31d95ac9e6
commit 65acc7c9ad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/ignore/ignore.go
View File

@ -120,13 +120,13 @@ func (m *Matcher) Match(file string) (result bool) {
func loadIgnoreFile(file string, seen map[string]bool) (*Matcher, error) {
if seen[file] {
return nil, fmt.Errorf("Multiple include of ignore file %q", file)
return &Matcher{}, fmt.Errorf("Multiple include of ignore file %q", file)
}
seen[file] = true
fd, err := os.Open(file)
if err != nil {
return nil, err
return &Matcher{}, err
}
defer fd.Close()
@ -134,7 +134,7 @@ func loadIgnoreFile(file string, seen map[string]bool) (*Matcher, error) {
}
func parseIgnoreFile(fd io.Reader, currentFile string, seen map[string]bool) (*Matcher, error) {
var exps Matcher
exps := Matcher{}
addPattern := func(line string) error {
include := true