Skip to content

Commit 73a2d1e

Browse files
Merge pull request #3087 from dscho/fsmonitor-touchups
2 parents dc703dd + f59cf9b commit 73a2d1e

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

compat/fsmonitor/fsmonitor-fs-listen-win32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static int normalize_path_in_utf8(FILE_NOTIFY_INFORMATION *info,
8282
if (len > 0)
8383
goto normalize;
8484
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
85-
error("[GLE %ld] could not convert path to UTF-8: '%.*S'",
85+
error("[GLE %ld] could not convert path to UTF-8: '%.*ls'",
8686
GetLastError(),
8787
(int)(info->FileNameLength / sizeof(WCHAR)),
8888
info->FileName);

repo-settings.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "config.h"
33
#include "repository.h"
44
#include "midx.h"
5+
#include "fsmonitor-ipc.h"
56

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

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

7475
if (!repo_config_get_bool(r, "feature.experimental", &value) && value) {
7576
UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
76-
#ifdef HAVE_FSMONITOR_DAEMON_BACKEND
77-
if (feature_many_files)
77+
if (feature_many_files && fsmonitor_ipc__is_supported())
7878
UPDATE_DEFAULT_BOOL(r->settings.use_builtin_fsmonitor,
7979
1);
80-
#else
81-
(void)feature_many_files;
82-
#endif
8380
}
8481

8582
/* Hack for test programs like test-dump-untracked-cache */

0 commit comments

Comments
 (0)