octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-08 23:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/ignore: Match directory contents for patterns ending in / (fixes #3639)

Browse Source 
Appends "**" to patterns with a terminal slash, so that directory
contents are ignored, but not the directory itself.
This commit is contained in:
Tim Howes 2016-10-04 08:12:55 +09:00 committed by Jakob Borg
parent 2a2177e7fa
commit fe9c2b9857
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ignore/ignore.go
View File

@ -345,7 +345,7 @@ func parseIgnoreFile(fd io.Reader, currentFile string, seen map[string]bool) ([]
case strings.HasSuffix(line, "/**"): case strings.HasSuffix(line, "/**"):
err = addPattern(line) err = addPattern(line)
case strings.HasSuffix(line, "/"): case strings.HasSuffix(line, "/"):
err = addPattern(line) err = addPattern(line + "**")
default: default:
err = addPattern(line) err = addPattern(line)
if err == nil { if err == nil {

19
lib/ignore/ignore_test.go
View File

@ -718,3 +718,22 @@ func TestIssue3174(t *testing.T) {
t.Error("Should match") t.Error("Should match")
} }
} }
func TestIssue3639(t *testing.T) {
stignore := `
foo/
`
pats := New(true)
err := pats.Parse(bytes.NewBufferString(stignore), ".stignore")
if err != nil {
t.Fatal(err)
}
if !pats.Match("foo/bar").IsIgnored() {
t.Error("Should match 'foo/bar'")
}
if pats.Match("foo").IsIgnored() {
t.Error("Should not match 'foo'")
}
}