Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If -w and -v are both on, don't output the "log the transfer"
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
d88d245
..
a3cdff4
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-20,6
+20,7
@@
#include "rsync.h"
extern int verbose;
#include "rsync.h"
extern int verbose;
+extern int what_has_changed;
extern int csum_length;
extern struct stats stats;
extern int io_error;
extern int csum_length;
extern struct stats stats;
extern int io_error;
@@
-47,7
+48,7
@@
extern struct stats stats;
static struct sum_struct *receive_sums(int f)
{
struct sum_struct *s;
static struct sum_struct *receive_sums(int f)
{
struct sum_struct *s;
-
size_t
i;
+
int32
i;
OFF_T offset = 0;
if (!(s = new(struct sum_struct)))
OFF_T offset = 0;
if (!(s = new(struct sum_struct)))
@@
-167,8
+168,8
@@
void send_files(struct file_list *flist, int f_out, int f_in)
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
- if (dry_run) {
- if (!am_server && verbose
) /* log the transfer */
+ if (dry_run) {
/* log the transfer */
+ if (!am_server && verbose
&& !what_has_changed)
rprintf(FINFO, "%s\n", safe_fname(fname2));
write_int(f_out, i);
continue;
rprintf(FINFO, "%s\n", safe_fname(fname2));
write_int(f_out, i);
continue;
@@
-229,7
+230,8
@@
void send_files(struct file_list *flist, int f_out, int f_in)
safe_fname(fname));
}
safe_fname(fname));
}
- if (!am_server && verbose) /* log the transfer */
+ /* log the transfer */
+ if (!am_server && verbose && !what_has_changed)
rprintf(FINFO, "%s\n", safe_fname(fname2));
set_compression(fname);
rprintf(FINFO, "%s\n", safe_fname(fname2));
set_compression(fname);