X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc5573623194fab2a331d1ffc8d284c9e25e06e7..7170ca8dba0a407cd0c91b41b48163c7b682abb1:/omit-dir-changes.diff

diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index a7db145..058fe3e 100644
--- a/omit-dir-changes.diff
+++ b/omit-dir-changes.diff
@@ -7,8 +7,8 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
 diff --git a/generator.c b/generator.c
-index 12007a1..29c9297 100644
 --- a/generator.c
 +++ b/generator.c
 @@ -44,6 +44,7 @@ extern int preserve_hard_links;
@@ -52,7 +52,6 @@ index 12007a1..29c9297 100644
  					       dflt_perms, statret == 0);
  		}
 diff --git a/options.c b/options.c
-index e7c6c61..03588fd 100644
 --- a/options.c
 +++ b/options.c
 @@ -59,6 +59,7 @@ int preserve_specials = 0;
@@ -79,8 +78,8 @@ index e7c6c61..03588fd 100644
    {"modify-window",    0,  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 },
-@@ -2020,6 +2023,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
- 		parse_rule(&filter_list, backup_dir_buf, 0, 0);
+@@ -2037,6 +2040,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ 		parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
  	}
  
 +	if (omit_dir_changes)
@@ -88,7 +87,7 @@ index e7c6c61..03588fd 100644
  	if (make_backups && !backup_dir) {
  		omit_dir_times = 0; /* Implied, so avoid -O to sender. */
  		if (preserve_times > 1)
-@@ -2263,6 +2268,8 @@ void server_options(char **args, int *argc_p)
+@@ -2280,6 +2285,8 @@ void server_options(char **args, int *argc_p)
  			argstr[x++] = 'm';
  		if (omit_dir_times)
  			argstr[x++] = 'O';
@@ -98,7 +97,6 @@ index e7c6c61..03588fd 100644
  		if (copy_links)
  			argstr[x++] = 'L';
 diff --git a/rsync.c b/rsync.c
-index 2c026a2..caf3204 100644
 --- a/rsync.c
 +++ b/rsync.c
 @@ -33,6 +33,7 @@ extern int preserve_xattrs;
@@ -124,7 +122,6 @@ index 2c026a2..caf3204 100644
  	if (S_ISLNK(sxp->st.st_mode)) {
  		;
 diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..9aef20a 100644
 --- a/rsync.yo
 +++ b/rsync.yo
 @@ -356,6 +356,7 @@ to the detailed description below for a complete description.  verb(
@@ -135,7 +132,7 @@ index 941f7a5..9aef20a 100644
       --super                 receiver attempts super-user activities
       --fake-super            store/recover privileged attrs using xattrs
   -S, --sparse                handle sparse files efficiently
-@@ -1071,6 +1072,10 @@ it is preserving modification times (see bf(--times)).  If NFS is sharing
+@@ -1078,6 +1079,10 @@ it is preserving modification times (see bf(--times)).  If NFS is sharing
  the directories on the receiving side, it is a good idea to use bf(-O).
  This option is inferred if you use bf(--backup) without bf(--backup-dir).