mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-09 14:50:56 +00:00
Do not return nil pointers when loading ignores (fixes #846)
Not sure, perhaps we should check for error, and respect that instead. But then in the walker we'll have to check for a nil pointer anyway.
This commit is contained in:
parent
964d17d05a
commit
31d95ac9e6
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user