Applied to trunk.

[rsync/rsync-patches.git] / link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 72657b7..eb6cf59 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -365,8 +365,8 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c     2005-02-25 18:44:31
-+++ options.c  2005-02-14 02:52:09
+--- orig/options.c     2005-03-01 05:49:24
++++ options.c  2005-03-01 01:27:55
 @@ -140,6 +140,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
@@ -422,7 +422,7 @@ the file's name.
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1433,6 +1451,11 @@ void server_options(char **args,int *arg
+@@ -1435,6 +1453,11 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -431,8 +431,8 @@ the file's name.
 +              args[ac++] = link_by_hash_dir;
 +      }
 +
-       if (files_from && (!am_sender || remote_filesfrom_file)) {
-               if (remote_filesfrom_file) {
+       if (files_from && (!am_sender || filesfrom_host)) {
+               if (filesfrom_host) {
                        args[ac++] = "--files-from";
 --- orig/receiver.c    2005-02-26 19:27:54
 +++ receiver.c 2005-01-15 21:29:13
@@ -560,7 +560,7 @@ the file's name.
  
  #include "byteorder.h"
  #include "lib/mdfour.h"
---- orig/rsync.yo      2005-02-26 05:22:51
+--- orig/rsync.yo      2005-03-01 01:22:59
 +++ rsync.yo   2005-02-13 06:58:47
 @@ -355,6 +355,7 @@ to the detailed description below for a 
   -y, --fuzzy                 find similar file for basis if no dest file