Skip to content

Commit ef9ea15

Browse files
committed
Enable the built-in FSMonitor as an experimental feature
If `feature.experimental` and `feature.manyFiles` are set and the user has not explicitly turned off the builtin FSMonitor, we now start the built-in FSMonitor by default. Only forcing it when UNSET matches the behavior of UPDATE_DEFAULT_BOOL() used for other repo settings. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Jeff Hostetler <[email protected]>
1 parent 41ac7f9 commit ef9ea15

File tree

1 file changed

+26
-1
lines changed

1 file changed

+26
-1
lines changed

repo-settings.c

+26-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
#include "config.h"
33
#include "repository.h"
44
#include "midx.h"
5-
#include "compat/fsmonitor/fsm-listen.h"
5+
#include "fsmonitor-ipc.h"
6+
#include "fsmonitor-settings.h"
67

78
static void repo_cfg_bool(struct repository *r, const char *key, int *dest,
89
int def)
@@ -44,6 +45,30 @@ void prepare_repo_settings(struct repository *r)
4445
if (experimental) {
4546
r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
4647
r->settings.gc_cruft_packs = 1;
48+
49+
/*
50+
* Force enable the builtin FSMonitor (unless the repo
51+
* is incompatible or they've already selected it or
52+
* the hook version). But only if they haven't
53+
* explicitly turned it off -- so only if our config
54+
* value is UNSET.
55+
*
56+
* lookup_fsmonitor_settings() and check_for_ipc() do
57+
* not distinguish between explicitly set FALSE and
58+
* UNSET, so we re-test for an UNSET config key here.
59+
*
60+
* I'm not sure I want to fix fsmonitor-settings.c to
61+
* have more than one _DISABLED state since our usage
62+
* here is only to support this experimental period
63+
* (and I don't want to overload the _reason field
64+
* because it describes incompabilities).
65+
*/
66+
if (manyfiles &&
67+
fsmonitor_ipc__is_supported() &&
68+
fsm_settings__get_mode(r) == FSMONITOR_MODE_DISABLED &&
69+
repo_config_get_maybe_bool(r, "core.fsmonitor", &value) > 0 &&
70+
repo_config_get_bool(r, "core.useBuiltinFSMonitor", &value))
71+
fsm_settings__set_ipc(r);
4772
}
4873
if (manyfiles) {
4974
r->settings.index_version = 4;

0 commit comments

Comments
 (0)