From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 1 Dec 2019 17:04:33 +0000 (-0800)
Subject: Merge branch 'kw/fsmonitor-watchman-fix'
X-Git-Tag: v2.25.0-rc0~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc7b26c907b7a07c143611c5acf31daa88a35eb3;p=thirdparty%2Fgit.git

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
---

fc7b26c907b7a07c143611c5acf31daa88a35eb3