diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:22 -0700 |
| commit | 7e84f4608f9c1f2217e7601010c2451f31dc4e92 (patch) | |
| tree | dafc6aa1ffe3eaa91e1ef883ede98bd778258a64 /t | |
| parent | Merge branch 'js/rebase-i-with-colliding-hash' into maint (diff) | |
| parent | index-pack: downgrade twice-resolved REF_DELTA to die() (diff) | |
| download | tgif-7e84f4608f9c1f2217e7601010c2451f31dc4e92.tar.xz | |
Merge branch 'jk/index-pack-dupfix' into maint
The index-pack code now diagnoses a bad input packstream that
records the same object twice when it is used as delta base; the
code used to declare a software bug when encountering such an
input, but it is an input error.
* jk/index-pack-dupfix:
index-pack: downgrade twice-resolved REF_DELTA to die()
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5309-pack-delta-cycles.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t5309-pack-delta-cycles.sh b/t/t5309-pack-delta-cycles.sh index 491556dad9..6c209ad45c 100755 --- a/t/t5309-pack-delta-cycles.sh +++ b/t/t5309-pack-delta-cycles.sh @@ -62,13 +62,13 @@ test_expect_success 'index-pack detects REF_DELTA cycles' ' test_must_fail git index-pack --fix-thin --stdin <cycle.pack ' -test_expect_failure 'failover to an object in another pack' ' +test_expect_success 'failover to an object in another pack' ' clear_packs && git index-pack --stdin <ab.pack && - git index-pack --stdin --fix-thin <cycle.pack + test_must_fail git index-pack --stdin --fix-thin <cycle.pack ' -test_expect_failure 'failover to a duplicate object in the same pack' ' +test_expect_success 'failover to a duplicate object in the same pack' ' clear_packs && { pack_header 3 && @@ -77,7 +77,7 @@ test_expect_failure 'failover to a duplicate object in the same pack' ' pack_obj $A } >recoverable.pack && pack_trailer recoverable.pack && - git index-pack --fix-thin --stdin <recoverable.pack + test_must_fail git index-pack --fix-thin --stdin <recoverable.pack ' test_done |