From: Wayne Davison <wayned@samba.org>
Date: Thu, 29 Sep 2005 07:41:50 +0000 (+0000)
Subject: Allow deletions to occur in directories transferred with the
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/8d6c1c4e97ed8d2803f93cd7bb7a0cc53255048c?ds=sidebyside;hp=10a1a3f5114e03d3bcc259246ac51c0662158e0b

Allow deletions to occur in directories transferred with the
--dirs option in addition to the regular --recursive behavior.
---

diff --git a/options.c b/options.c
index 9bb01f85..dacc3b88 100644
--- a/options.c
+++ b/options.c
@@ -1005,7 +1005,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 	if (files_from) {
 		if (recurse == 1) /* preserve recurse == 2 */
 			recurse = 0;
-		if (xfer_dirs < 0)
+		if (xfer_dirs < 1)
 			xfer_dirs = 1;
 	}
 
@@ -1022,7 +1022,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			"You may not combine multiple --delete-WHEN options.\n");
 		return 0;
 	}
-	if (!recurse) {
+	if (!xfer_dirs) {
 		delete_before = delete_during = delete_after = 0;
 		delete_mode = delete_excluded = 0;
 	} else if (delete_before || delete_during || delete_after)