t/t5318-commit-graph.sh: test generation zero transitions during fsck
The second test called "detect incorrect generation number" asserts that we correctly warn during an fsck when we see a non-zero generation number after seeing a zero beforehand. The other transition (going from non-zero to zero) was previously untested. Test both directions, and rename the existing test to make clear which direction it is exercising. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Taylor Blau committed
Aug 21, 2023 at 17:34 UTC
ce7629a315459c12451ee9071db22f8b0e26a4eb
1 file changed
+12
-6
t/t5318-commit-graph.sh
+12
-6
@@ -450,14 +450,15 @@ GRAPH_BYTE_FANOUT2=$(($GRAPH_FANOUT_OFFSET + 4 * 255))
450
GRAPH_OID_LOOKUP_OFFSET=$(($GRAPH_FANOUT_OFFSET + 4 * 256))
451
GRAPH_BYTE_OID_LOOKUP_ORDER=$(($GRAPH_OID_LOOKUP_OFFSET + $HASH_LEN * 8))
452
GRAPH_BYTE_OID_LOOKUP_MISSING=$(($GRAPH_OID_LOOKUP_OFFSET + $HASH_LEN * 4 + 10))
453
+GRAPH_COMMIT_DATA_WIDTH=$(($HASH_LEN + 16))
454
GRAPH_COMMIT_DATA_OFFSET=$(($GRAPH_OID_LOOKUP_OFFSET + $HASH_LEN * $NUM_COMMITS))
455
GRAPH_BYTE_COMMIT_TREE=$GRAPH_COMMIT_DATA_OFFSET
456
GRAPH_BYTE_COMMIT_PARENT=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN))
457
GRAPH_BYTE_COMMIT_EXTRA_PARENT=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN + 4))
458
GRAPH_BYTE_COMMIT_WRONG_PARENT=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN + 3))
459
GRAPH_BYTE_COMMIT_GENERATION=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN + 11))
460
+GRAPH_BYTE_COMMIT_GENERATION_LAST=$(($GRAPH_BYTE_COMMIT_GENERATION + $(($NUM_COMMITS - 1)) * $GRAPH_COMMIT_DATA_WIDTH))
461
GRAPH_BYTE_COMMIT_DATE=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN + 12))
460
-GRAPH_COMMIT_DATA_WIDTH=$(($HASH_LEN + 16))
462
GRAPH_OCTOPUS_DATA_OFFSET=$(($GRAPH_COMMIT_DATA_OFFSET + \
463
$GRAPH_COMMIT_DATA_WIDTH * $NUM_COMMITS))
464
GRAPH_BYTE_OCTOPUS=$(($GRAPH_OCTOPUS_DATA_OFFSET + 4))
@@ -596,11 +597,6 @@ test_expect_success 'detect incorrect generation number' '
597
"generation for commit"
598
'
599
599
-test_expect_success 'detect incorrect generation number' '
600
- corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_GENERATION "\01" \
601
- "but zero elsewhere"
602
-'
603
-
600
test_expect_success 'detect incorrect commit date' '
601
corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_DATE "\01" \
602
"commit date"
@@ -622,6 +618,16 @@ test_expect_success 'detect incorrect chunk count' '
618
$GRAPH_CHUNK_LOOKUP_OFFSET
619
'
620
621
+test_expect_success 'detect mixed generation numbers (non-zero to zero)' '
622
+ corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_GENERATION_LAST "\0\0\0\0" \
623
+ "but non-zero elsewhere"
624
+'
625
+
626
+test_expect_success 'detect mixed generation numbers (zero to non-zero)' '
627
+ corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_GENERATION "\0\0\0\0" \
628
+ "but zero elsewhere"
629
+'
630
+
631
test_expect_success 'git fsck (checks commit-graph when config set to true)' '
632
git -C full fsck &&
633
corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \