Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #3087 from dscho/fsmonitor-touchups
  • Loading branch information
jeffhostetler committed Mar 8, 2021
2 parents dc703dd + f59cf9b commit 73a2d1e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion compat/fsmonitor/fsmonitor-fs-listen-win32.c
Expand Up @@ -82,7 +82,7 @@ static int normalize_path_in_utf8(FILE_NOTIFY_INFORMATION *info,
if (len > 0)
goto normalize;
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
error("[GLE %ld] could not convert path to UTF-8: '%.*S'",
error("[GLE %ld] could not convert path to UTF-8: '%.*ls'",
GetLastError(),
(int)(info->FileNameLength / sizeof(WCHAR)),
info->FileName);
Expand Down
7 changes: 2 additions & 5 deletions repo-settings.c
Expand Up @@ -2,6 +2,7 @@
#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)

Expand Down Expand Up @@ -73,13 +74,9 @@ void prepare_repo_settings(struct repository *r)

if (!repo_config_get_bool(r, "feature.experimental", &value) && value) {
UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
#ifdef HAVE_FSMONITOR_DAEMON_BACKEND
if (feature_many_files)
if (feature_many_files && fsmonitor_ipc__is_supported())
UPDATE_DEFAULT_BOOL(r->settings.use_builtin_fsmonitor,
1);
#else
(void)feature_many_files;
#endif
}

/* Hack for test programs like test-dump-untracked-cache */
Expand Down

0 comments on commit 73a2d1e

Please sign in to comment.