fixup! gvfs: disable the built-in FSMonitor

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
microsoft · Oct 5, 2021 · e4dcae6 · e4dcae6
1 parent 9f82d43
commit e4dcae6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
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 &&