fsmonitor: invalidate entire cone on directory move/rename

Invalidate the CE_FSMONITOR_VALID bit for all of the files in the
cone under a directory when it is moved or renamed.

Previously, we only invalidated the files immediately contained within
the directory, but that ignored the fact that the pathnames of nested
items also changed.

Signed-off-by: Jeff Hostetler <[email protected]>

fsmonitor.c

@@ -199,7 +199,6 @@ static void fsmonitor_refresh_callback(struct index_state *istate, char *name)
 {
 	int i, len = strlen(name);
 	if (name[len - 1] == '/') {
-		const char *rel;
 		int pos = index_name_pos(istate, name, len);
 		if (pos < 0)
 			pos = -pos - 1;
@@ -208,10 +207,13 @@ static void fsmonitor_refresh_callback(struct index_state *istate, char *name)
 		for (i = pos; i < istate->cache_nr; i++) {
 			if (!starts_with(istate->cache[i]->name, name))
 				break;
-			/* Only mark the immediate children in the folder */
-			rel = istate->cache[i]->name + len;
-			if (!strchr(rel, '/'))
-				istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
+			/*
+			 * A directory event may mean that the
+			 * directory was moved or renamed.  We need to
+			 * invalidate the entire tree under it and
+			 * force a normal scan under this cone.
+			 */
+			istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
 		}
 		/* Need to remove the / from the path for the untracked cache */
 		name[len - 1] = '\0';

t/t7527-builtin-fsmonitor.sh

@@ -261,6 +261,16 @@ test_expect_success 'setup' '
 	trace*
 	EOF
 
+	mkdir -p T1/T2/T3/T4 &&
+	echo 1 >T1/F1 &&
+	echo 1 >T1/T2/F1 &&
+	echo 1 >T1/T2/T3/F1 &&
+	echo 1 >T1/T2/T3/T4/F1 &&
+	echo 2 >T1/F2 &&
+	echo 2 >T1/T2/F2 &&
+	echo 2 >T1/T2/T3/F2 &&
+	echo 2 >T1/T2/T3/T4/F2 &&
+
 	git -c core.useBuiltinFSMonitor= add . &&
 	test_tick &&
 	git -c core.useBuiltinFSMonitor= commit -m initial &&
@@ -354,6 +364,19 @@ verify_status() {
 	echo HELLO AFTER
 }
 
+move_directory_contents_deeper() {
+	mkdir T1/_new_
+	mv T1/[A-Z]* T1/_new_
+}
+
+move_directory_up() {
+	mv T1/T2/T3 T1
+}
+
+move_directory() {
+	mv T1/T2/T3 T1/T2/NewT3
+}
+
 # The next few test cases confirm that our fsmonitor daemon sees each type
 # of OS filesystem notification that we care about.  At this layer we just
 # ensure we are getting the OS notifications and do not try to confirm what
@@ -687,6 +710,9 @@ do
 		matrix_try $uc_val $fsm_val rename_files
 		matrix_try $uc_val $fsm_val file_to_directory
 		matrix_try $uc_val $fsm_val directory_to_file
+		matrix_try $uc_val $fsm_val move_directory_contents_deeper
+		matrix_try $uc_val $fsm_val move_directory_up
+		matrix_try $uc_val $fsm_val move_directory
 
 		if test $fsm_val = true
 		then