fixup! gvfs: disable the built-in FSMonitor

jeffhostetler · jeffhostetler · commit e4dcae60785e · 2021-10-05T10:35:09.000-04:00
Signed-off-by: Jeff Hostetler &lt;jeffhost@microsoft.com&gt;
diff --git a/fsmonitor-ipc.c b/fsmonitor-ipc.c
@@ -1,5 +1,4 @@
 #include "cache.h"
-#include "config.h"
 #include "fsmonitor.h"
 #include "simple-ipc.h"
 #include "fsmonitor-ipc.h"
@@ -11,8 +10,6 @@
 
 int fsmonitor_ipc__is_supported(void)
 {
-	if (git_config_get_virtualfilesystem())
-		return 0;
 	return 1;
 }
 
diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c
@@ -127,9 +127,6 @@ static void lookup_fsmonitor_settings(struct repository *r)
 
 enum fsmonitor_mode fsm_settings__get_mode(struct repository *r)
 {
-	if (git_config_get_virtualfilesystem())
-		return FSMONITOR_MODE_INCOMPATIBLE;
-
 	if (!r->settings.fsmonitor)
 		lookup_fsmonitor_settings(r);
 
diff --git a/t/t1093-virtualfilesystem.sh b/t/t1093-virtualfilesystem.sh
@@ -368,7 +368,7 @@ test_expect_success 'folder with same prefix as file' '
 	test_cmp expected actual
 '
 
-test_expect_success 'virtualfilsystem hook disables built-in FSMonitor ' '
+test_expect_success MINGW,FSMONITOR_DAEMON 'virtualfilsystem hook disables built-in FSMonitor ' '
 	clean_repo &&
 	test_config core.usebuiltinfsmonitor true &&
 	write_script .git/hooks/virtualfilesystem <<-\EOF &&

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "cache.h"`
`2`		`-#include "config.h"`
`3`	`2`	`#include "fsmonitor.h"`
`4`	`3`	`#include "simple-ipc.h"`
`5`	`4`	`#include "fsmonitor-ipc.h"`
`@@ -11,8 +10,6 @@`
`11`	`10`
`12`	`11`	`int fsmonitor_ipc__is_supported(void)`
`13`	`12`	`{`
`14`		`- if (git_config_get_virtualfilesystem())`
`15`		`- return 0;`
`16`	`13`	`return 1;`
`17`	`14`	`}`
`18`	`15`
Original file line number	Diff line number	Diff line change
`@@ -127,9 +127,6 @@ static void lookup_fsmonitor_settings(struct repository *r)`
`127`	`127`
`128`	`128`	`enum fsmonitor_mode fsm_settings__get_mode(struct repository *r)`
`129`	`129`	`{`
`130`		`- if (git_config_get_virtualfilesystem())`
`131`		`- return FSMONITOR_MODE_INCOMPATIBLE;`
`132`		`-`
`133`	`130`	`if (!r->settings.fsmonitor)`
`134`	`131`	`lookup_fsmonitor_settings(r);`
`135`	`132`
Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ test_expect_success 'folder with same prefix as file' '`
`368`	`368`	`test_cmp expected actual`
`369`	`369`	`'`
`370`	`370`
`371`		`-test_expect_success 'virtualfilsystem hook disables built-in FSMonitor ' '`
	`371`	`+test_expect_success MINGW,FSMONITOR_DAEMON 'virtualfilsystem hook disables built-in FSMonitor ' '`
`372`	`372`	`clean_repo &&`
`373`	`373`	`test_config core.usebuiltinfsmonitor true &&`
`374`	`374`	`write_script .git/hooks/virtualfilesystem <<-\EOF &&`