Skip to content

Commit 44265e5

Browse files
committed
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
2 parents 02ec5e2 + 6692d45 commit 44265e5

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

builtin/fsmonitor--daemon.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,7 @@ static int do_handle_client(struct fsmonitor_daemon_state *state,
710710
"fsmonitor: unsupported V1 protocol '%s'"),
711711
command);
712712
do_trivial = 1;
713+
do_cookie = 1;
713714

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

723725
} else {
724726
/*

0 commit comments

Comments
 (0)