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
- Improved log_formatted() to handle long filenames better.
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
f91f4a1
..
c1e4232
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-21,6
+21,7
@@
#include "rsync.h"
extern int verbose;
#include "rsync.h"
extern int verbose;
+extern int itemize_changes;
extern int delete_after;
extern int csum_length;
extern struct stats stats;
extern int delete_after;
extern int csum_length;
extern struct stats stats;
@@
-387,8
+388,8
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
if (verbose > 2)
rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
if (verbose > 2)
rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
- if (dry_run) {
- if (!am_server && verbose
) /* log the transfer */
+ if (dry_run) {
/* log the transfer */
+ if (!am_server && verbose
&& !itemize_changes)
rprintf(FINFO, "%s\n", safe_fname(fname));
continue;
}
rprintf(FINFO, "%s\n", safe_fname(fname));
continue;
}
@@
-531,7
+532,8
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
cleanup_set(fnametmp, partialptr, file, fd1, fd2);
}
cleanup_set(fnametmp, partialptr, file, fd1, fd2);
}
- if (!am_server && verbose) /* log the transfer */
+ /* log the transfer */
+ if (!am_server && verbose && !itemize_changes)
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */