Merge remote-tracking branch 'origin/feat/size-only' into dev
# Conflicts: # src/client/client_cli.c # src/client/usage.c # src/server/receiver.c # src/server/server.c # src/shared/config.c # src/shared/config.h # tests/integration/test_features.py # tests/test_config.c
This commit is contained in:
@@ -387,7 +387,7 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
|
||||
match = (old_size == 0 || old_data) && old_checksum == check_checksum;
|
||||
free(old_data);
|
||||
old_data = NULL;
|
||||
} else if (match) {
|
||||
} else if (match && !config->size_only) {
|
||||
match = (long long)st.st_mtime == check_mtime;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user