The branch, master has been updated via da448cdc Mention the latest NEWS items. via d619a87a Avoid noop_io_until_death() if --msgs2stderr was specified. from a931301b Search for double-fuzzy files only when needed
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit da448cdc99e64d2016ec84bb1e6eebd23c3151fd Author: Wayne Davison <wa...@opencoder.net> Date: Sat May 30 05:54:09 2020 -0700 Mention the latest NEWS items. commit d619a87aa527a9d74ba7ee03ba4b9eb1cb4d8b16 Author: Wayne Davison <wa...@opencoder.net> Date: Sat May 30 05:53:59 2020 -0700 Avoid noop_io_until_death() if --msgs2stderr was specified. ----------------------------------------------------------------------- Summary of changes: NEWS.md | 26 +++++++++++++++++--------- io.c | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS.md b/NEWS.md index 4cddcd89..6782b5cb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -35,6 +35,13 @@ Protocol: 31 (unchanged) - Fixed a crash in the `--iconv` code. + - Fixed a problem with the `--link-dest`|`--copy-dest` code when `--xattrs` + was specified along with multiple alternate-destination directories (it + could possibly choose a bad file match while trying to find a better xattr + match). + + - Fixed a couple bugs in the handling of files with the `--sparse` option. + - Fixed a bug in the writing of the batch.sh file (w/--write-batch) when the source & destination args were not last on the command-line. @@ -50,11 +57,11 @@ Protocol: 31 (unchanged) The environment variable `RSYNC_CHECKSUM_LIST` can be used to customize the preference order of the negotiation. - - Various compression enhancements, including a negotiation heuristic that - tries to pick the best compression option supported by both sides. The - environment variable `RSYNC_COMPRESS_LIST` can be used to customize the - preference order of the heuristic (which will be more useful when new - compression options are added). + - Various compression enhancements, including the addition of zstd and lz4 + compression algorithms and a negotiation heuristic that picks the best + compression option supported by both sides. The environment variable + `RSYNC_COMPRESS_LIST` can be used to customize the preference order of the + heuristic when speaking to another rsync 3.2.0 version. - Added the `--atimes` option based on the long-standing patch (just with some fixes that the patch has been needing). @@ -86,10 +93,11 @@ Protocol: 31 (unchanged) - Added support for `RSYNC_SHELL` & `RSYNC_NO_XFER_EXEC` environment variables that affect the pre-xfer exec and post-xfer exec rsync daemon options. - - Fixed a problem with the `--link-dest`|`--copy-dest` code when `--xattrs` - was specified along with multiple alternate-destination directories (it - could possibly choose a bad file match while trying to find a better xattr - match). + - Optimize the `--fuzzy` `--fuzzy` heuristic to avoid the fuzzy directory scan + until all other basis-file options are exhausted (such as `--link-dest`). + + - Have a daemon that is logging include the normal-exit sent/received stats + even when the transfer exited with an error. - Various manpage improvements. diff --git a/io.c b/io.c index e6cfbbda..999c34e5 100644 --- a/io.c +++ b/io.c @@ -915,7 +915,7 @@ void noop_io_until_death(void) { char buf[1024]; - if (!iobuf.in.buf || !iobuf.out.buf || iobuf.in_fd < 0 || iobuf.out_fd < 0 || kluge_around_eof) + if (!iobuf.in.buf || !iobuf.out.buf || iobuf.in_fd < 0 || iobuf.out_fd < 0 || kluge_around_eof || msgs2stderr) return; kluge_around_eof = 2; -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs