X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7abcfd85b701a6c9354b5986eeb248bb766e57d4..cc911409d6561d66094c2303e9a79b41ea4f2ef5:/rsync.c

diff --git a/rsync.c b/rsync.c
index 48894c97..85244c88 100644
--- a/rsync.c
+++ b/rsync.c
@@ -561,8 +561,12 @@ 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;
+		if (fnamecmp == fname)
+			fnamecmp = get_backup_name(fname);
+	}
 
 	/* Change permissions before putting the file into place. */
 	set_file_attrs(fnametmp, file, NULL, fnamecmp,