From 9dada89b653a4bcc5864fdd91ef50383f68ffd33 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 24 May 2021 02:42:38 +0200 Subject: [PATCH] fixup! Enable the built-in FSMonitor as an experimental feature Drop this commit in preparation for re-applying it on top of fsmonitor-v2. Signed-off-by: Johannes Schindelin --- repo-settings.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/repo-settings.c b/repo-settings.c index 237dbfe61d..bbcf71461b 100644 --- a/repo-settings.c +++ b/repo-settings.c @@ -2,13 +2,12 @@ #include "config.h" #include "repository.h" #include "midx.h" -#include "fsmonitor-ipc.h" #define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0) void prepare_repo_settings(struct repository *r) { - int value, feature_many_files = 0; + int value; char *strval; if (r->settings.initialized) @@ -63,7 +62,6 @@ void prepare_repo_settings(struct repository *r) r->settings.use_builtin_fsmonitor = 1; if (!repo_config_get_bool(r, "feature.manyfiles", &value) && value) { - feature_many_files = 1; UPDATE_DEFAULT_BOOL(r->settings.index_version, 4); UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_WRITE); } @@ -72,12 +70,8 @@ void prepare_repo_settings(struct repository *r) r->settings.fetch_write_commit_graph = value; UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 0); - if (!repo_config_get_bool(r, "feature.experimental", &value) && value) { + if (!repo_config_get_bool(r, "feature.experimental", &value) && value) UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING); - if (feature_many_files && fsmonitor_ipc__is_supported()) - UPDATE_DEFAULT_BOOL(r->settings.use_builtin_fsmonitor, - 1); - } /* Hack for test programs like test-dump-untracked-cache */ if (ignore_untracked_cache_config)