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

fixup! fsmonitor-ipc: create client routines for git-fsmonitor--daemon

Browse Source 
Now that we have a correct fix where we guarantee again (just like
v1 of the built-in FSMonitor) that `since_token` is not `NULL`, we can
revert the work-arounds introduced by these two PRs:

- https://github.com/git-for-windows/pull/3241

- https://github.com/git-for-windows/pull/3258

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2021-06-09 09:54:50 +02:00
parent bc40a560d3
commit 7eb8372f9f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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,