commit-graph: test for corrupted octopus edge
The commit-graph file has an extra chunk to store the parent int-ids for parents beyond the first parent for octopus merges. Our test repo has a single octopus merge that we can manipulate to demonstrate the 'verify' subcommand detects incorrect values in that chunk. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Jun 27, 2018 at 09:24 UTC
437787ae1b05ddf1d4f16e92d07573d7c320a3a4
1 file changed
+10
t/t5318-commit-graph.sh
+10
@@ -248,6 +248,7 @@ test_expect_success 'git commit-graph verify' '
248
'
249
250
NUM_COMMITS=9
251
+NUM_OCTOPUS_EDGES=2
252
HASH_LEN=20
253
GRAPH_BYTE_VERSION=4
254
GRAPH_BYTE_HASH=5
@@ -274,6 +275,10 @@ GRAPH_BYTE_COMMIT_EXTRA_PARENT=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN + 4))
275
GRAPH_BYTE_COMMIT_WRONG_PARENT=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN + 3))
276
GRAPH_BYTE_COMMIT_GENERATION=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN + 11))
277
GRAPH_BYTE_COMMIT_DATE=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN + 12))
278
+GRAPH_COMMIT_DATA_WIDTH=$(($HASH_LEN + 16))
279
+GRAPH_OCTOPUS_DATA_OFFSET=$(($GRAPH_COMMIT_DATA_OFFSET + \
280
+ $GRAPH_COMMIT_DATA_WIDTH * $NUM_COMMITS))
281
+GRAPH_BYTE_OCTOPUS=$(($GRAPH_OCTOPUS_DATA_OFFSET + 4))
282
283
# usage: corrupt_graph_and_verify <position> <data> <string>
284
# Manipulates the commit-graph file at the position
@@ -383,4 +388,9 @@ test_expect_success 'detect incorrect commit date' '
388
"commit date"
389
'
390
391
+test_expect_success 'detect incorrect parent for octopus merge' '
392
+ corrupt_graph_and_verify $GRAPH_BYTE_OCTOPUS "\01" \
393
+ "invalid parent"
394
+'
395
+
396
test_done