From 7abb0826cf402e8ce74540bb98e987248bd757ca Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 25 Jul 2018 14:08:55 +0200 Subject: [PATCH] Backport 64014dd374dc81cef24898b51830703a527e923f --- src/libsync/discovery.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index fde3a135f1..0f9bb3a668 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -672,7 +672,8 @@ void ProcessDirectoryJob::processFile(PathTuple path, auto up = _discoveryData->_statedb->getUploadInfo(path._original); if (up._valid && up._contentChecksum == remoteChecksumHeader) { // Solve the conflict into an upload, or nothing - item->_instruction = up._modtime == localEntry.modtime ? CSYNC_INSTRUCTION_UPDATE_METADATA : CSYNC_INSTRUCTION_SYNC; + item->_instruction = up._modtime == localEntry.modtime && up._size == localEntry.size + ? CSYNC_INSTRUCTION_UPDATE_METADATA : CSYNC_INSTRUCTION_SYNC; item->_direction = SyncFileItem::Up; // Update the etag and other server metadata in the journal already