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

vfs: disable the built-in FSMonitor
microsoft · Aug 3, 2021 · e4b73fa · e4b73fa
2 parents ff1fddf + 45a8afa
commit e4b73fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/repo-settings.c b/repo-settings.c
@@ -59,7 +59,8 @@ void prepare_repo_settings(struct repository *r)
 		r->settings.core_multi_pack_index = value;
 	UPDATE_DEFAULT_BOOL(r->settings.core_multi_pack_index, 1);
 
-	if (!repo_config_get_bool(r, "core.usebuiltinfsmonitor", &value) && value)
+	if (!git_config_get_virtualfilesystem() &&
+	    !repo_config_get_bool(r, "core.usebuiltinfsmonitor", &value) && value)
 		r->settings.use_builtin_fsmonitor = 1;
 
 	if (!repo_config_get_bool(r, "feature.manyfiles", &value) && value) {

diff --git a/t/t1093-virtualfilesystem.sh b/t/t1093-virtualfilesystem.sh
@@ -368,4 +368,14 @@ 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 status &&
+	test_must_fail git fsmonitor--daemon status
+'
+
 test_done