X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e4b619b46d6ad596a8e5ceaa6b5d34b0fd2cc527..121bfb2b4d9df88bfbc9917209842bb8d9d17e22:/compat.c

diff --git a/compat.c b/compat.c
index f62c191a..ef9292f9 100644
--- a/compat.c
+++ b/compat.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Andrew Tridgell 1996
  * Copyright (C) Paul Mackerras 1996
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004, 2005, 2006, 2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 
 int remote_protocol = 0;
 int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
-int incremental = 0;
+int inc_recurse = 0;
 
 extern int verbose;
 extern int am_server;
@@ -146,8 +146,8 @@ void setup_protocol(int f_out,int f_in)
 		}
 	} else if (protocol_version >= 30) {
 		if (recurse && !preserve_hard_links && !delete_before
-		 && !delete_after && !delay_updates)
-			incremental = 1;
+		 && !delete_after && !delay_updates && !prune_empty_dirs)
+			inc_recurse = 1;
 		need_messages_from_generator = 1;
 	}