Merge branch 'bp/fsmonitor'

gitster · gitster · commit 8e777af273dd · 2017-12-28T14:08:48.000-08:00
Test fix.

* bp/fsmonitor:
  p7519: improve check for prerequisite WATCHMAN
diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh
@@ -40,8 +40,7 @@ test_lazy_prereq UNTRACKED_CACHE '
 '
 
 test_lazy_prereq WATCHMAN '
-	{ command -v watchman >/dev/null 2>&1; ret=$?; } &&
-	test $ret -ne 1
+	command -v watchman
 '
 
 if test_have_prereq WATCHMAN

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,7 @@ test_lazy_prereq UNTRACKED_CACHE '`
`40`	`40`	`'`
`41`	`41`
`42`	`42`	`test_lazy_prereq WATCHMAN '`
`43`		`- { command -v watchman >/dev/null 2>&1; ret=$?; } &&`
`44`		`- test $ret -ne 1`
	`43`	`+ command -v watchman`
`45`	`44`	`'`
`46`	`45`
`47`	`46`	`if test_have_prereq WATCHMAN`