aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-03-25 16:16:34 -0700
committerJunio C Hamano <gitster@pobox.com>2024-03-25 16:16:34 -0700
commit46d8bf30e47c0426e83c9899f55703807eb3129b (patch)
treef52d65c591fe3e205b72353ba2f2fb6034156bc0
parentd921c365ee7b2c74b605cd6a8668c9b2e699992b (diff)
parentad538c61dab42db9012bba7b41bbd63f75ff6469 (diff)
downloadgit-46d8bf30e47c0426e83c9899f55703807eb3129b.tar.gz
Merge branch 'jc/index-pack-fsck-levels'
Test fix. * jc/index-pack-fsck-levels: t5300: fix test_with_bad_commit()
-rwxr-xr-xt/t5300-pack-object.sh2
1 files changed, 1 insertions, 1 deletions
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"
)
}