felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

lib/ignore: Only skip for toplevel includes (fixes #6487) (#6508)

Browse Source
This commit is contained in:
Simon Frei
2020-04-07 10:23:38 +02:00
committed by GitHub
parent b64052bc26
commit 07ce3572a0
3 changed files with 64 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ignore/ignore.go
+3 -8
View File
@@ -67,16 +67,11 @@ func (p Pattern) allowsSkippingIgnoredDirs() bool {
if p.pattern[0] != '/' {
return false
}
// Double asterisk everywhere in the path except at the end is bad
if strings.Contains(strings.TrimSuffix(p.pattern, "**"), "**") {
if strings.Contains(p.pattern[1:], "/") {
return false
}
// Any wildcards anywhere except for the last path component are bad
lastSep := strings.LastIndex(p.pattern, "/")
if lastSep == -1 {
return true
}
return p.pattern[:lastSep] == glob.QuoteMeta(p.pattern[:lastSep])
// Double asterisk everywhere in the path except at the end is bad
return !strings.Contains(strings.TrimSuffix(p.pattern, "**"), "**")
}
type Result uint8