Skip to content

Commit 7eb8372

Browse files
committed
fixup! fsmonitor-ipc: create client routines for git-fsmonitor--daemon
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 <[email protected]>
1 parent bc40a56 commit 7eb8372

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fsmonitor-ipc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ int fsmonitor_ipc__send_query(const char *since_token,
4444
trace2_region_enter("fsm_client", "query", NULL);
4545

4646
trace2_data_string("fsm_client", NULL, "query/command",
47-
since_token ? since_token : "(null-token)");
47+
since_token);
4848

4949
try_again:
5050
state = ipc_client_try_connect(fsmonitor_ipc__get_path(), &options,
@@ -53,7 +53,7 @@ int fsmonitor_ipc__send_query(const char *since_token,
5353
switch (state) {
5454
case IPC_STATE__LISTENING:
5555
ret = ipc_client_send_command_to_connection(
56-
connection, since_token, since_token ? strlen(since_token) : 0, answer);
56+
connection, since_token, strlen(since_token), answer);
5757
ipc_client_close_connection(connection);
5858

5959
trace2_data_intmax("fsm_client", NULL,

0 commit comments

Comments
 (0)