Merge branch 'kw/fsmonitor-watchman-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:33 +0000 (09:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:33 +0000 (09:04 -0800)
commitfc7b26c907b7a07c143611c5acf31daa88a35eb3
treeb359944776b9d5366b658e578d94424e3bcf1ddd
parentbad5ed39cdd84953f935f4442dd92fe3f7afafc2
parentdd0b61f577f041f1119bb3288451f8f9b7f9e3f2
Merge branch 'kw/fsmonitor-watchman-fix'

The watchman integration for fsmonitor was racy, which has been
corrected to be more conservative.

* kw/fsmonitor-watchman-fix:
  fsmonitor: fix watchman integration