Skip to content

Commit 7ed17ed

Browse files
jeffhostetlerdscho
authored andcommitted
fixup! Enable the built-in FSMonitor as an experimental feature
This reverts commit 3bcb1a2. Signed-off-by: Jeff Hostetler <[email protected]>
1 parent 8735530 commit 7ed17ed

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

repo-settings.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
#include "config.h"
33
#include "repository.h"
44
#include "midx.h"
5-
#include "fsmonitor-ipc.h"
6-
#include "fsmonitor-settings.h"
5+
#include "compat/fsmonitor/fsm-listen.h"
76

87
#define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0)
98

109
void prepare_repo_settings(struct repository *r)
1110
{
12-
int value, feature_many_files = 0;
11+
int value;
1312
char *strval;
1413

1514
if (r->settings.initialized)
@@ -63,7 +62,6 @@ void prepare_repo_settings(struct repository *r)
6362
UPDATE_DEFAULT_BOOL(r->settings.core_multi_pack_index, 1);
6463

6564
if (!repo_config_get_bool(r, "feature.manyfiles", &value) && value) {
66-
feature_many_files = 1;
6765
UPDATE_DEFAULT_BOOL(r->settings.index_version, 4);
6866
UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_WRITE);
6967
}
@@ -72,11 +70,8 @@ void prepare_repo_settings(struct repository *r)
7270
r->settings.fetch_write_commit_graph = value;
7371
UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 0);
7472

75-
if (!repo_config_get_bool(r, "feature.experimental", &value) && value) {
73+
if (!repo_config_get_bool(r, "feature.experimental", &value) && value)
7674
UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
77-
if (feature_many_files && fsmonitor_ipc__is_supported())
78-
fsm_settings__set_ipc(r);
79-
}
8075

8176
/* Hack for test programs like test-dump-untracked-cache */
8277
if (ignore_untracked_cache_config)

0 commit comments

Comments
 (0)