From b2ef3d9ebb95ce369330d1f09db361aa39c67013 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 23 Aug 2013 20:02:35 -0400 Subject: [PATCH] test index-pack on packs with recoverable delta cycles The previous commit added tests to show that index-pack correctly bails in unrecoverable situations. There are some situations where the data could be recovered, but it is not currently: 1. If we can break the cycle using an object from another pack via --fix-thin. 2. If we can break the cycle using a duplicate of one of the objects found in the same pack. Note that neither of these is particularly high priority; a delta cycle within a pack should never occur, and we have no record of even a buggy git implementation creating such a pack. However, it's worth adding these tests for two reasons. One, to document that we do not currently handle the situation, even though it is possible. And two, to exercise the code that runs in this situation; even though it fails, by running it we can confirm that index-pack detects the situation and aborts, and does not misbehave (e.g., by following the cycle in an infinite loop). In both cases, we hit an assert that aborts index-pack. Signed-off-by: Jeff King Acked-by: Nicolas Pitre Signed-off-by: Junio C Hamano --- t/t5309-pack-delta-cycles.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/t/t5309-pack-delta-cycles.sh b/t/t5309-pack-delta-cycles.sh index 1640bf7764..3e7861b075 100755 --- a/t/t5309-pack-delta-cycles.sh +++ b/t/t5309-pack-delta-cycles.sh @@ -56,4 +56,22 @@ test_expect_success 'index-pack detects REF_DELTA cycles' ' test_must_fail git index-pack --fix-thin --stdin recoverable.pack && + pack_trailer recoverable.pack && + git index-pack --fix-thin --stdin