Merge pull request git-for-windows#379 from dscho/disable-fsmonitor-with-gvfs

vfs: disable the built-in FSMonitor

Author: dscho

fsmonitor-ipc.c

@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "config.h"
 #include "fsmonitor.h"
 #include "simple-ipc.h"
 #include "fsmonitor-ipc.h"
@@ -10,6 +11,8 @@
 
 int fsmonitor_ipc__is_supported(void)
 {
+	if (git_config_get_virtualfilesystem())
+		return 0;
 	return 1;
 }
 

fsmonitor-settings.c

@@ -127,6 +127,9 @@ 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);
 

t/t1093-virtualfilesystem.sh

@@ -368,4 +368,15 @@ test_expect_success 'folder with same prefix as file' '
 	test_cmp expected actual
 '
 
+test_expect_success 'virtualfilsystem hook disables built-in FSMonitor ' '
+	clean_repo &&
+	test_config core.usebuiltinfsmonitor true &&
+	write_script .git/hooks/virtualfilesystem <<-\EOF &&
+		printf "dir1/\0"
+	EOF
+	git config core.virtualfilesystem .git/hooks/virtualfilesystem &&
+	git status &&
+	test_must_fail git fsmonitor--daemon status
+'
+
 test_done