Merge branch 'jc/index-pack-fsck-levels'

gitster · gitster · commit 46d8bf30e47c · 2024-03-25T16:16:34.000-07:00
Test fix.

* jc/index-pack-fsck-levels:
  t5300: fix test_with_bad_commit()
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
@@ -465,7 +465,7 @@ test_with_bad_commit () {
 	must_pass_arg="$2" &&
 	(
 		cd strict &&
-		test_expect_fail git index-pack "$must_fail_arg" "test-$(cat pack-name).pack"
+		test_must_fail git index-pack "$must_fail_arg" "test-$(cat pack-name).pack" &&
 		git index-pack "$must_pass_arg" "test-$(cat pack-name).pack"
 	)
 }

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ test_with_bad_commit () {`
`465`	`465`	`must_pass_arg="$2" &&`
`466`	`466`	`(`
`467`	`467`	`cd strict &&`
`468`		`- test_expect_fail git index-pack "$must_fail_arg" "test-$(cat pack-name).pack"`
	`468`	`+ test_must_fail git index-pack "$must_fail_arg" "test-$(cat pack-name).pack" &&`
`469`	`469`	`git index-pack "$must_pass_arg" "test-$(cat pack-name).pack"`
`470`	`470`	`)`
`471`	`471`	`}`