If --recurse wasn't specified, turn off all the --delete* options.
authorWayne Davison <wayned@samba.org>
Sat, 29 Jan 2005 22:35:50 +0000 (22:35 +0000)
committerWayne Davison <wayned@samba.org>
Sat, 29 Jan 2005 22:35:50 +0000 (22:35 +0000)
options.c

index 9aa0c26..944bb24 100644 (file)
--- a/options.c
+++ b/options.c
@@ -914,7 +914,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        "You may not combine multiple --delete-WHEN options.\n");
                return 0;
        }
-       if (delete_before || delete_during || delete_after)
+       if (!recurse) {
+               delete_before = delete_during = delete_after = 0;
+               delete_mode = delete_excluded = 0;
+       } else if (delete_before || delete_during || delete_after)
                delete_mode = 1;
        else if (delete_mode || delete_excluded)
                delete_mode = delete_before = 1;