mirror of
https://github.com/git-for-windows/git.git
synced 2026-05-02 08:03:45 -05:00
fixup! Enable the built-in FSMonitor as an experimental feature
This reverts commit 3bcb1a2f29.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This commit is contained in:
committed by
Johannes Schindelin
parent
8735530946
commit
7ed17ed9e7
@@ -2,14 +2,13 @@
|
||||
#include "config.h"
|
||||
#include "repository.h"
|
||||
#include "midx.h"
|
||||
#include "fsmonitor-ipc.h"
|
||||
#include "fsmonitor-settings.h"
|
||||
#include "compat/fsmonitor/fsm-listen.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)
|
||||
UPDATE_DEFAULT_BOOL(r->settings.core_multi_pack_index, 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,11 +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())
|
||||
fsm_settings__set_ipc(r);
|
||||
}
|
||||
|
||||
/* Hack for test programs like test-dump-untracked-cache */
|
||||
if (ignore_untracked_cache_config)
|
||||
|
||||
Reference in New Issue
Block a user