Handle the extra output needed when log_format_has_i > 1.

diff --git a/generator.c b/generator.c
index 32f0dde3f6e443dd5d1115ae742ed6726f352a42..8e731e28fef5cfd0dfcabc5f9709d9c6d4366e1f 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -360,7 +360,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 
        iflags &= 0xffff;
        if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
-         || (xname && *xname)) && !read_batch) {
+         || log_format_has_i > 1 || (xname && *xname)) && !read_batch) {
                if (protocol_version >= 29) {
                        if (ndx >= 0)
                                write_int(sock_f_out, ndx);

diff --git a/log.c b/log.c
index 0b2b8e9556d1976f8b150a33d5f55d41656a637d..a1df72d06277f28b4394ecc47a1fbf2a357b7b0a 100644 (file)
--- a/log.c
+++ b/log.c
@@ -646,7 +646,7 @@ void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
 {
        int significant_flags = iflags & SIGNIFICANT_ITEM_FLAGS;
        int see_item = itemizing && (significant_flags || *buf
-                                 || (verbose > 1 && log_format_has_i));
+               || log_format_has_i > 1 || (verbose > 1 && log_format_has_i));
        int local_change = iflags & ITEM_LOCAL_CHANGE && significant_flags;
        if (am_server) {
                if (am_daemon && !dry_run && see_item)