mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jh/t7527-unflake-by-forcing-cookie'

Browse Source 
Make fsmonitor more robust to avoid the flakiness seen in t7527.

* jh/t7527-unflake-by-forcing-cookie:
  fsmonitor: fix race seen in t7527
This commit is contained in:
Junio C Hamano
2022-12-19 11:46:13 +09:00
parent 02ec5e2eec 6692d45477
commit 44265e5b57
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/fsmonitor--daemon.c
View File

@ -710,6 +710,7 @@ static int do_handle_client(struct fsmonitor_daemon_state *state,
"fsmonitor: unsupported V1 protocol '%s'"), "fsmonitor: unsupported V1 protocol '%s'"),
command); command);
do_trivial = 1; do_trivial = 1;
do_cookie = 1;
} else { } else {
/* We have "builtin:*" */ /* We have "builtin:*" */
@ -719,6 +720,7 @@ static int do_handle_client(struct fsmonitor_daemon_state *state,
"fsmonitor: invalid V2 protocol token '%s'", "fsmonitor: invalid V2 protocol token '%s'",
command); command);
do_trivial = 1; do_trivial = 1;
do_cookie = 1;
} else { } else {
/* /*