The patches for 3.3.0.

[rsync-patches.git] / omit-dir-changes.diff

diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index f0ff1c3028c706dbdfab9cb9c06cd341dd1015e5..5caceb71da20be5c06926a3b54e6302c03cf489a 100644 (file)
--- a/omit-dir-changes.diff
+++ b/omit-dir-changes.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
-based-on: f9e29dfb0912f2689ad10a7ba14ebb3ed43cf153
+based-on: 6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -59,7 +59,7 @@ diff --git a/options.c b/options.c
  int omit_dir_times = 0;
  int omit_link_times = 0;
  int trust_sender = 0;
-@@ -646,6 +647,7 @@ static struct poptOption long_options[] = {
+@@ -647,6 +648,7 @@ static struct poptOption long_options[] = {
    {"omit-link-times", 'J', POPT_ARG_VAL,    &omit_link_times, 1, 0, 0 },
    {"no-omit-link-times",0, POPT_ARG_VAL,    &omit_link_times, 0, 0, 0 },
    {"no-J",             0,  POPT_ARG_VAL,    &omit_link_times, 0, 0, 0 },
@@ -67,7 +67,7 @@ diff --git a/options.c b/options.c
    {"modify-window",   '@', POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
    {"super",            0,  POPT_ARG_VAL,    &am_root, 2, 0, 0 },
    {"no-super",         0,  POPT_ARG_VAL,    &am_root, 0, 0, 0 },
-@@ -2302,7 +2304,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2321,7 +2323,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
        }
  
@@ -76,7 +76,7 @@ diff --git a/options.c b/options.c
                omit_dir_times = -1; /* Implied, so avoid -O to sender. */
  
        if (stdout_format) {
-@@ -2815,6 +2817,8 @@ void server_options(char **args, int *argc_p)
+@@ -2837,6 +2839,8 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = "--size-only";
                if (do_stats)
                        args[ac++] = "--stats";
@@ -88,7 +88,7 @@ diff --git a/options.c b/options.c
 diff --git a/rsync.1.md b/rsync.1.md
 --- a/rsync.1.md
 +++ b/rsync.1.md
-@@ -427,6 +427,7 @@ has its own detailed description later in this manpage.
+@@ -463,6 +463,7 @@ has its own detailed description later in this manpage.
  --crtimes, -N            preserve create times (newness)
  --omit-dir-times, -O     omit directories from --times
  --omit-link-times, -J    omit symlinks from --times
@@ -96,7 +96,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --super                  receiver attempts super-user activities
  --fake-super             store/recover privileged attrs using xattrs
  --sparse, -S             turn sequences of nulls into sparse blocks
-@@ -1604,6 +1605,11 @@ expand it.
+@@ -1656,6 +1657,11 @@ expand it.
      This tells rsync to omit symlinks when it is preserving modification,
      access, and create times.