TapTap/FastSync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Release v2.26.0 #284

Merged
TapTap merged 210 commits from dev into main 2026-09-18 19:05:52 +02:00
Conversation 0 Commits 210 Files Changed 170
+6 -7
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 410ba6e992 - Show all commits
src/server/receiver.c
+3 -4
View File
@@ -398,10 +398,9 @@ int receiver_process_pending(Config* config, int file_descriptor, const Receiver
--max-delete-capped commit still succeeds and the transfer proceeds; --max-delete-capped commit still succeeds and the transfer proceeds;
the terminal success frame reports the cap. */ the terminal success frame reports the cap. */
size_t deleted = 0; size_t deleted = 0;
DeleteCommitResult deletion = DeleteCommitResult deletion = (config->use_delete || config->delete_missing_args)
(config->use_delete || config->delete_missing_args) ? manifest_delete_all_counted(config, manifest, &deleted)
? manifest_delete_all_counted(config, manifest, &deleted) : DELETE_COMMIT_OK;
: DELETE_COMMIT_OK;
receiver_tally_deleted(sink, deleted); receiver_tally_deleted(sink, deleted);
delete_manifest_free(manifest); delete_manifest_free(manifest);
if (deletion == DELETE_COMMIT_ERROR) { if (deletion == DELETE_COMMIT_ERROR) {
src/server/server.c
+3 -3
View File
@@ -975,9 +975,9 @@ void handler(int file_descriptor) {
if (context->deferred_plans) { if (context->deferred_plans) {
/* Defence in depth (the enclosing block already excludes dry-run): a /* Defence in depth (the enclosing block already excludes dry-run): a
-n run never commits a deletion. */ -n run never commits a deletion. */
DeleteCommitResult deletion = config->dry_run ? DELETE_COMMIT_OK DeleteCommitResult deletion =
: delete_plan_session_commit( config->dry_run ? DELETE_COMMIT_OK
context->deferred_plans, config); : delete_plan_session_commit(context->deferred_plans, config);
context->stats.deleted_files += delete_plan_session_deleted(context->deferred_plans); context->stats.deleted_files += delete_plan_session_deleted(context->deferred_plans);
if (deletion == DELETE_COMMIT_ERROR) { if (deletion == DELETE_COMMIT_ERROR) {
transfer_ok = false; transfer_ok = false;