Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
a8ed495
)
Don't force -v with -n if -w was specified.
author
Wayne Davison
<wayned@samba.org>
Tue, 15 Feb 2005 07:20:11 +0000
(07:20 +0000)
committer
Wayne Davison
<wayned@samba.org>
Tue, 15 Feb 2005 07:20:11 +0000
(07:20 +0000)
main.c
patch
|
blob
|
blame
|
history
diff --git
a/main.c
b/main.c
index
fc67eae
..
46d4f69
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-30,6
+30,7
@@
extern int am_sender;
extern int am_generator;
extern int am_daemon;
extern int verbose;
+extern int what_has_changed;
extern int blocking_io;
extern int delete_before;
extern int daemon_over_rsh;
@@
-1173,8
+1174,8
@@
int main(int argc,char *argv[])
exit_cleanup(RERR_SYNTAX);
}
- if (dry_run)
- verbose =
MAX(verbose,1)
;
+ if (dry_run
&& !verbose && !what_has_changed
)
+ verbose =
1
;
if (am_server) {
set_nonblocking(STDIN_FILENO);