git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-29 05:38:16 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge pull request #3263 from dscho/fix-built-in-fsmonitor

Browse Source 
FSMonitor fixes
This commit is contained in:
Johannes Schindelin
2021-06-09 18:05:27 +02:00
committed by GitHub
parent 4c204998d0 cfa0c45308
commit b312fa405f
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/fsmonitor--daemon.c
View File

@@ -672,7 +672,6 @@ static int do_handle_client(struct fsmonitor_daemon_state *state,
*/
do_flush = 1;
do_trivial = 1;
do_cookie = 1;
} else if (!skip_prefix(command, "builtin:", &p)) {
/* assume V1 timestamp or garbage */
@@ -686,7 +685,6 @@ static int do_handle_client(struct fsmonitor_daemon_state *state,
"fsmonitor: unsupported V1 protocol '%s'"),
command);
do_trivial = 1;
do_cookie = 1;
} else {
/* We have "builtin:*" */
@@ -696,7 +694,6 @@ static int do_handle_client(struct fsmonitor_daemon_state *state,
"fsmonitor: invalid V2 protocol token '%s'",
command);
do_trivial = 1;
do_cookie = 1;
} else {
/*

4
fsmonitor-ipc.c
View File

@@ -44,7 +44,7 @@ int fsmonitor_ipc__send_query(const char *since_token,
trace2_region_enter("fsm_client", "query", NULL);
trace2_data_string("fsm_client", NULL, "query/command",
since_token ? since_token : "(null-token)");
since_token);
try_again:
state = ipc_client_try_connect(fsmonitor_ipc__get_path(), &options,
@@ -53,7 +53,7 @@ try_again:
switch (state) {
case IPC_STATE__LISTENING:
ret = ipc_client_send_command_to_connection(
connection, since_token, since_token ? strlen(since_token) : 0, answer);
connection, since_token, strlen(since_token), answer);
ipc_client_close_connection(connection);
trace2_data_intmax("fsm_client", NULL,

5
fsmonitor.c
View File

@@ -290,8 +290,9 @@ void refresh_fsmonitor(struct index_state *istate)
trace_printf_key(&trace_fsmonitor, "refresh fsmonitor");
if (r->settings.use_builtin_fsmonitor > 0) {
query_success = !fsmonitor_ipc__send_query(
istate->fsmonitor_last_update, &query_result);
query_success = istate->fsmonitor_last_update &&
!fsmonitor_ipc__send_query(istate->fsmonitor_last_update,
&query_result);
if (query_success) {
/*
* The response contains a series of nul terminated