From 45a8afa2f25b7e099e79c51bba54d31e969000dd Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 18 Jun 2021 14:45:20 +0200 Subject: [PATCH] gvfs: disable the built-in FSMonitor When using a virtual file system layer, the FSMonitor does not make sense. Signed-off-by: Johannes Schindelin --- repo-settings.c | 3 ++- t/t1093-virtualfilesystem.sh | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/repo-settings.c b/repo-settings.c index 237dbfe61d6fbf..92074c27b5e16c 100644 --- 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 index 8ba9a2a75e093a..e67ea97112f561 100755 --- 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