Merge branch 'gs/commit-graph-path-filter'

gitster · gitster · commit f37d9598789a · 2020-05-24T19:39:38.000-07:00
Test fix.

* gs/commit-graph-path-filter:
  t4216: avoid unnecessary subshell in test_bloom_filters_not_used
diff --git a/t/t4216-log-bloom.sh b/t/t4216-log-bloom.sh
@@ -70,7 +70,7 @@ test_bloom_filters_used () {
 test_bloom_filters_not_used () {
 	log_args=$1
 	setup "$log_args" &&
-	!(grep -q "statistics:{\"filter_not_present\":" "$TRASH_DIRECTORY/trace.perf") &&
+	! grep -q "statistics:{\"filter_not_present\":" "$TRASH_DIRECTORY/trace.perf" &&
 	test_cmp log_wo_bloom log_w_bloom
 }
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ test_bloom_filters_used () {`
`70`	`70`	`test_bloom_filters_not_used () {`
`71`	`71`	`log_args=$1`
`72`	`72`	`setup "$log_args" &&`
`73`		`- !(grep -q "statistics:{\"filter_not_present\":" "$TRASH_DIRECTORY/trace.perf") &&`
	`73`	`+ ! grep -q "statistics:{\"filter_not_present\":" "$TRASH_DIRECTORY/trace.perf" &&`
`74`	`74`	`test_cmp log_wo_bloom log_w_bloom`
`75`	`75`	`}`
`76`	`76`