t3035: prefer test_must_fail to bash negation for git commands

newren · gitster · commit d5bb92ecede5 · 2020-02-27T11:01:48.000-08:00
Signed-off-by: Elijah Newren &lt;newren@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t3035-merge-sparse.sh b/t/t3035-merge-sparse.sh
@@ -28,7 +28,7 @@ test_expect_success 'setup' '
 	git config core.sparseCheckout true &&
 	echo "/checked-out" >.git/info/sparse-checkout &&
 	git reset --hard &&
-	! git merge theirs
+	test_must_fail git merge theirs
 '
 
 test_expect_success 'reset --hard works after the conflict' '
@@ -42,7 +42,7 @@ test_expect_success 'is reset properly' '
 '
 
 test_expect_success 'setup: conflict back' '
-	! git merge theirs
+	test_must_fail git merge theirs
 '
 
 test_expect_success 'Merge abort works after the conflict' '

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ test_expect_success 'setup' '`
`28`	`28`	`git config core.sparseCheckout true &&`
`29`	`29`	`echo "/checked-out" >.git/info/sparse-checkout &&`
`30`	`30`	`git reset --hard &&`
`31`		`- ! git merge theirs`
	`31`	`+ test_must_fail git merge theirs`
`32`	`32`	`'`
`33`	`33`
`34`	`34`	`test_expect_success 'reset --hard works after the conflict' '`
`@@ -42,7 +42,7 @@ test_expect_success 'is reset properly' '`
`42`	`42`	`'`
`43`	`43`
`44`	`44`	`test_expect_success 'setup: conflict back' '`
`45`		`- ! git merge theirs`
	`45`	`+ test_must_fail git merge theirs`
`46`	`46`	`'`
`47`	`47`
`48`	`48`	`test_expect_success 'Merge abort works after the conflict' '`