diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-12-19 05:46:13 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-19 05:46:13 +0300 |
| commit | 44265e5b579dccd97593d3df091b6b03bfb187a8 (patch) | |
| tree | f6d45fbe26aa736705788d921655b0e03eb58f8a /builtin/fsmonitor--daemon.c | |
| parent | 02ec5e2eec9afa154d7610ff2bd8e2455541c8e2 (diff) | |
| parent | 6692d45477dd80adf026b513a10a6d98de802811 (diff) | |
Merge branch 'jh/t7527-unflake-by-forcing-cookie'
Make fsmonitor more robust to avoid the flakiness seen in t7527.
* jh/t7527-unflake-by-forcing-cookie:
fsmonitor: fix race seen in t7527
Diffstat (limited to 'builtin/fsmonitor--daemon.c')
| -rw-r--r-- | builtin/fsmonitor--daemon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c index 6f30a4f93a..6607130c9f 100644 --- a/builtin/fsmonitor--daemon.c +++ b/builtin/fsmonitor--daemon.c @@ -710,6 +710,7 @@ 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:*" */ @@ -719,6 +720,7 @@ static int do_handle_client(struct fsmonitor_daemon_state *state, "fsmonitor: invalid V2 protocol token '%s'", command); do_trivial = 1; + do_cookie = 1; } else { /* |