Merge branch 'bp/fsmonitor'

Test fix.

* bp/fsmonitor:
  p7519: improve check for prerequisite WATCHMAN
This commit is contained in:
Junio C Hamano 2017-12-28 14:08:48 -08:00
commit 8e777af273

View file

@ -40,8 +40,7 @@ test_lazy_prereq UNTRACKED_CACHE '
' '
test_lazy_prereq WATCHMAN ' test_lazy_prereq WATCHMAN '
{ command -v watchman >/dev/null 2>&1; ret=$?; } && command -v watchman
test $ret -ne 1
' '
if test_have_prereq WATCHMAN if test_have_prereq WATCHMAN