Merge pull request #3287 from dscho/redo-fsmonitor-null-last-update

Redo fix for FSMonitor
git-for-windows · Jun 26, 2021 · 6297c67 · 6297c67
2 parents ede73ed + ad66002
commit 6297c67
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/fsmonitor.c b/fsmonitor.c
@@ -290,9 +290,10 @@ void refresh_fsmonitor(struct index_state *istate)
 	trace_printf_key(&trace_fsmonitor, "refresh fsmonitor");
 
 	if (r->settings.use_builtin_fsmonitor > 0) {
-		query_success = istate->fsmonitor_last_update &&
-			!fsmonitor_ipc__send_query(istate->fsmonitor_last_update,
-						   &query_result);
+		query_success = !fsmonitor_ipc__send_query(
+			istate->fsmonitor_last_update ?
+			istate->fsmonitor_last_update : "builtin:fake",
+			&query_result);
 		if (query_success) {
 			/*
 			 * The response contains a series of nul terminated