mirror of
https://github.com/octoleo/syncthing.git
synced 2025-02-02 11:58:28 +00:00
lib/ignore: Don't match root (".")
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4122
This commit is contained in:
parent
9de6cdddfd
commit
0b854dff9d
@ -163,7 +163,7 @@ func (m *Matcher) patternsUnchanged(file string) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *Matcher) Match(file string) (result Result) {
|
func (m *Matcher) Match(file string) (result Result) {
|
||||||
if m == nil {
|
if m == nil || file == "." {
|
||||||
return resultNotMatched
|
return resultNotMatched
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -843,3 +843,32 @@ func TestIsInternal(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRoot(t *testing.T) {
|
||||||
|
stignore := `
|
||||||
|
!/a
|
||||||
|
/*
|
||||||
|
`
|
||||||
|
|
||||||
|
testcases := []struct {
|
||||||
|
file string
|
||||||
|
matches bool
|
||||||
|
}{
|
||||||
|
{".", false},
|
||||||
|
{"a", false},
|
||||||
|
{"b", true},
|
||||||
|
}
|
||||||
|
|
||||||
|
pats := New(true)
|
||||||
|
err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range testcases {
|
||||||
|
res := pats.Match(tc.file).IsIgnored()
|
||||||
|
if res != tc.matches {
|
||||||
|
t.Errorf("Matches(%q) == %v, expected %v", tc.file, res, tc.matches)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user