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

Merge branch 'pr/903' 

* pr/903:
  Ignore all paths within .stversions folder
This commit is contained in:
Jakob Borg 2014-10-26 11:47:27 +01:00
parent d4199c2d08 33267f2178
commit 04b960b415
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
internal/model/testdata/.syncthing.file vendored
View File

Binary file not shown.

5
internal/scanner/walk.go
View File

@ -20,6 +20,7 @@ import (
"os"
"path/filepath"
"runtime"
"strings"
"code.google.com/p/go.text/unicode/norm"
@ -113,8 +114,8 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo) filepath.WalkFun
return nil
}
if sn := filepath.Base(rn); sn == ".stignore" || sn == ".stversions" ||
sn == ".stfolder" || (w.Matcher != nil && w.Matcher.Match(rn)) {
if sn := filepath.Base(rn); sn == ".stignore" || sn == ".stfolder" ||
strings.HasPrefix(rn, ".stversions") || (w.Matcher != nil && w.Matcher.Match(rn)) {
// An ignored file
if debug {
l.Debugln("ignored:", rn)