SQUASH???

gitster · gitster · commit 5485ae365052 · 2016-10-14T14:12:25.000-07:00
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
@@ -913,7 +913,7 @@ test_expect_success 'git bisect reset cleans bisection state properly' '
 
 test_expect_success 'check whether bisection cleanup is not done with bad merges' '
 	git bisect start $HASH7 $SIDE_HASH7 &&
-	test_expect_failure git bisect bad >out 2>out &&
+	test_must_fail git bisect bad >out 2>out &&
 	test_i18ngrep "The merge base" out &&
 	test -e .git/BISECT_START
 '

Original file line number	Diff line number	Diff line change
`@@ -913,7 +913,7 @@ test_expect_success 'git bisect reset cleans bisection state properly' '`
`913`	`913`
`914`	`914`	`test_expect_success 'check whether bisection cleanup is not done with bad merges' '`
`915`	`915`	`git bisect start $HASH7 $SIDE_HASH7 &&`
`916`		`- test_expect_failure git bisect bad >out 2>out &&`
	`916`	`+ test_must_fail git bisect bad >out 2>out &&`
`917`	`917`	`test_i18ngrep "The merge base" out &&`
`918`	`918`	`test -e .git/BISECT_START`
`919`	`919`	`'`