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
+7 -8
View File
@@ -297,16 +297,16 @@ func blocksEqual(a, b []BlockInfo) bool {
return true
}
func (f *FileInfo) SetMustRescan(by ShortID) {
f.setLocalFlags(by, FlagLocalMustRescan)
func (f *FileInfo) SetMustRescan() {
f.setLocalFlags(FlagLocalMustRescan)
}
func (f *FileInfo) SetIgnored(by ShortID) {
f.setLocalFlags(by, FlagLocalIgnored)
func (f *FileInfo) SetIgnored() {
f.setLocalFlags(FlagLocalIgnored)
}
func (f *FileInfo) SetUnsupported(by ShortID) {
f.setLocalFlags(by, FlagLocalUnsupported)
func (f *FileInfo) SetUnsupported() {
f.setLocalFlags(FlagLocalUnsupported)
}
func (f *FileInfo) SetDeleted(by ShortID) {
@@ -317,10 +317,9 @@ func (f *FileInfo) SetDeleted(by ShortID) {
f.setNoContent()
}
func (f *FileInfo) setLocalFlags(by ShortID, flags uint32) {
func (f *FileInfo) setLocalFlags(flags uint32) {
f.RawInvalid = false
f.LocalFlags = flags
f.ModifiedBy = by
f.setNoContent()
}
+3 -3
View File
@@ -635,17 +635,17 @@ func TestLocalFlagBits(t *testing.T) {
t.Error("file should have no weird bits set by default")
}
f.SetIgnored(42)
f.SetIgnored()
if !f.IsIgnored() || f.MustRescan() || !f.IsInvalid() {
t.Error("file should be ignored and invalid")
}
f.SetMustRescan(42)
f.SetMustRescan()
if f.IsIgnored() || !f.MustRescan() || !f.IsInvalid() {
t.Error("file should be must-rescan and invalid")
}
f.SetUnsupported(42)
f.SetUnsupported()
if f.IsIgnored() || f.MustRescan() || !f.IsInvalid() {
t.Error("file should be invalid")
}