X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f1ca7c4429f2a8e9de72f91d95218bb324df6a9e..e9489cd6cb380b30727bd3d074eacc59abca080e:/rsync.c diff --git a/rsync.c b/rsync.c index 48894c97..9921da04 100644 --- a/rsync.c +++ b/rsync.c @@ -561,8 +561,11 @@ int finish_transfer(const char *fname, const char *fnametmp, goto do_set_file_attrs; } - if (make_backups > 0 && overwriting_basis && !make_backup(fname)) - return 1; + if (make_backups > 0 && overwriting_basis) { + if (!make_backup(fname)) + return 1; + fnamecmp = get_backup_name(fname); + } /* Change permissions before putting the file into place. */ set_file_attrs(fnametmp, file, NULL, fnamecmp,