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

lib: Do not set ModifiedBy on meta only changes (#7345)

Browse Source
This commit is contained in:
Simon Frei
2021-02-08 15:30:39 +01:00
committed by GitHub
parent e95d005c21
commit c0f353c0e8
8 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/model/folder.go
+4 -4
View File
@@ -652,7 +652,7 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *fileInfoB
if ignoredParent != "" && !fs.IsParent(file.Name, ignoredParent) {
for _, file := range toIgnore {
l.Debugln("marking file as ignored", file)
nf := file.ConvertToIgnoredFileInfo(f.shortID)
nf := file.ConvertToIgnoredFileInfo()
if batchAppend(nf, snap) {
changes++
}
@@ -682,7 +682,7 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *fileInfoB
}
l.Debugln("marking file as ignored", file)
nf := file.ConvertToIgnoredFileInfo(f.shortID)
nf := file.ConvertToIgnoredFileInfo()
if batchAppend(nf, snap) {
changes++
}
@@ -745,7 +745,7 @@ func (f *folder) scanSubdirsDeletedAndIgnored(subDirs []string, batch *fileInfoB
if iterError == nil && len(toIgnore) > 0 {
for _, file := range toIgnore {
l.Debugln("marking file as ignored", f)
nf := file.ConvertToIgnoredFileInfo(f.shortID)
nf := file.ConvertToIgnoredFileInfo()
if batchAppend(nf, snap) {
changes++
}
@@ -1192,7 +1192,7 @@ func (f *folder) handleForcedRescans() {
if !ok {
continue
}
fi.SetMustRescan(f.shortID)
fi.SetMustRescan()
batch.append(fi)
}