From: John Cai <johncai86@gmail.com>
Date: Fri, 15 Mar 2024 04:57:26 +0000 (+0000)
Subject: t5300: fix test_with_bad_commit()
X-Git-Tag: v2.45.0-rc0~81^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad538c61dab42db9012bba7b41bbd63f75ff6469;p=thirdparty%2Fgit.git

t5300: fix test_with_bad_commit()

0f8edf7317 (index-pack: --fsck-objects to take an optional argument for
fsck msgs, 2024-02-01) added a test function test_with_bad_commit() that
contained two bugs. test_expect_fail was used instead of test_must_fail,
and a && was not included at the end of the line.

Fix these two issues in the test.

Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index a58f91035d..61e2be2903 100755
--- 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"
 	)
 }