diff --git a/fsmonitor-ipc.c b/fsmonitor-ipc.c index 52a3392e16e465..ccc32d2a17ebe7 100644 --- 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 index c900199423029c..1aa77b3193e1ff 100644 --- 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 index 0f43fc06e01571..0c6cf38fd347bf 100755 --- 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 &&