diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:22:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 17:22:50 -0700 |
| commit | 588c038ac690e012a00dcace34fb318449f5ec7c (patch) | |
| tree | d604d58fdb9d655e784d30b28b157e01eb289621 /t/t5302-pack-index.sh | |
| parent | e75bf76f5462af4185d8260f6feecf24dd24a516 (diff) | |
| parent | 1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d (diff) | |
| download | git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.gz | |
Merge branch 'sb/dashless'
* sb/dashless:
Make usage strings dash-less
t/: Use "test_must_fail git" instead of "! git"
t/test-lib.sh: exit with small negagive int is ok with test_must_fail
Conflicts:
builtin-blame.c
builtin-mailinfo.c
builtin-mailsplit.c
builtin-shortlog.c
git-am.sh
t/t4150-am.sh
t/t4200-rerere.sh
Diffstat (limited to 't/t5302-pack-index.sh')
| -rwxr-xr-x | t/t5302-pack-index.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh index ecec591634..0639772ac4 100755 --- a/t/t5302-pack-index.sh +++ b/t/t5302-pack-index.sh @@ -118,7 +118,7 @@ test_expect_success \ test_expect_success \ '[index v1] 4) confirm that the pack is actually corrupted' \ - '! git fsck --full $commit' + 'test_must_fail git fsck --full $commit' test_expect_success \ '[index v1] 5) pack-objects happily reuses corrupted data' \ @@ -127,7 +127,7 @@ test_expect_success \ test_expect_success \ '[index v1] 6) newly created pack is BAD !' \ - '! git verify-pack -v "test-4-${pack1}.pack"' + 'test_must_fail git verify-pack -v "test-4-${pack1}.pack"' test_expect_success \ '[index v2] 1) stream pack to repository' \ @@ -156,11 +156,11 @@ test_expect_success \ test_expect_success \ '[index v2] 4) confirm that the pack is actually corrupted' \ - '! git fsck --full $commit' + 'test_must_fail git fsck --full $commit' test_expect_success \ '[index v2] 5) pack-objects refuses to reuse corrupted data' \ - '! git pack-objects test-5 <obj-list' + 'test_must_fail git pack-objects test-5 <obj-list' test_expect_success \ '[index v2] 6) verify-pack detects CRC mismatch' \ @@ -173,7 +173,8 @@ test_expect_success \ ( while read obj do git cat-file -p $obj >/dev/null || exit 1 done <obj-list ) && - err=$(! git verify-pack ".git/objects/pack/pack-${pack1}.pack" 2>&1) && + err=$(test_must_fail git verify-pack \ + ".git/objects/pack/pack-${pack1}.pack" 2>&1) && echo "$err" | grep "CRC mismatch"' test_done |