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

lib/ignore: Consistent behaviour for nil *Matcher 

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4310
This commit is contained in:
Simon Frei 2017-09-06 06:39:18 +00:00 committed by Jakob Borg
parent baec3f909c
commit 9dbc509996
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ignore/ignore.go
View File

@ -173,7 +173,7 @@ func (m *Matcher) parseLocked(r io.Reader, file string) error {
}
func (m *Matcher) Match(file string) (result Result) {
if m == nil || file == "." {
if file == "." {
return resultNotMatched
}
@ -228,10 +228,6 @@ func (m *Matcher) Lines() []string {
// Patterns return a list of the loaded patterns, as they've been parsed
func (m *Matcher) Patterns() []string {
if m == nil {
return nil
}
m.mut.Lock()
defer m.mut.Unlock()

3
lib/scanner/walk.go
View File

@ -85,6 +85,9 @@ func Walk(ctx context.Context, cfg Config) (chan protocol.FileInfo, error) {
if w.Filesystem == nil {
panic("no filesystem specified")
}
if w.Matcher == nil {
w.Matcher = ignore.New(w.Filesystem)
}
return w.walk(ctx)
}