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

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
+1 -1
View File
@@ -748,7 +748,7 @@ func (db *schemaUpdater) updateSchemaTo14(_ int) error {
continue
}
fi.SetMustRescan(protocol.LocalDeviceID.Short())
fi.SetMustRescan()
if err = t.putFile(it.Key(), fi); err != nil {
return err
}
+1 -1
View File
@@ -1354,7 +1354,7 @@ func TestNeedAfterUnignore(t *testing.T) {
// Initial state: Devices in sync, locally ignored
local := protocol.FileInfo{Name: file, Version: protocol.Vector{Counters: []protocol.Counter{{ID: remID, Value: 1}, {ID: myID, Value: 1}}}, ModifiedS: 10}
local.SetIgnored(myID)
local.SetIgnored()
remote := protocol.FileInfo{Name: file, Version: protocol.Vector{Counters: []protocol.Counter{{ID: remID, Value: 1}, {ID: myID, Value: 1}}}, ModifiedS: 10}
s.Update(protocol.LocalDeviceID, fileList{local})
s.Update(remoteDevice0, fileList{remote})
+2 -2
View File
@@ -125,9 +125,9 @@ func (f FileInfoTruncated) FileModifiedBy() protocol.ShortID {
return f.ModifiedBy
}
func (f FileInfoTruncated) ConvertToIgnoredFileInfo(by protocol.ShortID) protocol.FileInfo {
func (f FileInfoTruncated) ConvertToIgnoredFileInfo() protocol.FileInfo {
file := f.copyToFileInfo()
file.SetIgnored(by)
file.SetIgnored()
return file
}