Got rid of the erroneous --dry-run short-circuit in the directory

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index a05b758..c34047d 100644 (file)
--- a/options.c
+++ b/options.c
@@ -200,7 +200,7 @@ static void print_rsync_version(enum logcode f)
        rprintf(f, "              %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums\n",
                have_inplace, ipv6,
                (int) (sizeof dumstat->st_ino * 8),
-               (int) (sizeof (uint64) * 8));
+               (int) (sizeof (int64) * 8));
 #ifdef MAINTAINER_MODE
        rprintf(f, "              panic action: \"%s\"\n",
                get_panic_action());
@@ -857,8 +857,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 
        if (relative_paths < 0)
                relative_paths = files_from? 1 : 0;
-       if (!relative_paths)
-               implied_dirs = 0;
 
        *argv = poptGetArgs(pc);
        *argc = count_args(*argv);
@@ -1240,7 +1238,7 @@ void server_options(char **args,int *argc)
                if (!relative_paths)
                        args[ac++] = "--no-relative";
        }
-       if (relative_paths && !implied_dirs && !am_sender)
+       if (!implied_dirs && !am_sender)
                args[ac++] = "--no-implied-dirs";
 
        *argc = ac;