When running 'git commit-graph verify', compare the contents of the
commits that are loaded from the commit-graph file with commits that are
loaded directly from the object database. This includes checking the
root tree object ID, commit date, and parents.
Parse the commit from the graph during the initial loop through the
object IDs to guarantee we parse from the commit-graph file.
In addition, verify the generation number calculation is correct for all
commits in the commit-graph file.
While testing, we discovered that mutating the integer value for a
parent to be outside the accepted range causes a segmentation fault. Add
a new check in insert_parent_or_die() that prevents this fault. Check
for that error during the test, both in the typical parents and in the
list of parents for octopus merges.
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
---
commit-graph.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++
t/t5318-commit-graph.sh | 64 +++++++++++++++++++++++++++++++
2 files changed, 164 insertions(+)
diff --git a/commit-graph.c b/commit-graph.c
index 5bb93e533c..a15ad9710d 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -237,6 +237,10 @@ static struct commit_list **insert_parent_or_die(struct commit_graph *g,
{
struct commit *c;
struct object_id oid;
+
+ if (pos >= g->num_commits)
+ die("invalide parent position %"PRIu64, pos);
+
hashcpy(oid.hash, g->chunk_oid_lookup + g->hash_len * pos);
c = lookup_commit(&oid);
if (!c)
@@ -875,6 +879,8 @@ int verify_commit_graph(struct commit_graph *g)
return 1;
for (i = 0; i < g->num_commits; i++) {
+ struct commit *graph_commit;
+
hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);
if (i && oidcmp(&prev_oid, &cur_oid) >= 0)
@@ -892,6 +898,10 @@ int verify_commit_graph(struct commit_graph *g)
cur_fanout_pos++;
}
+
+ graph_commit = lookup_commit(&cur_oid);
+ if (!parse_commit_in_graph_one(g, graph_commit))
+ graph_report("failed to parse %s from commit-graph", oid_to_hex(&cur_oid));
}
while (cur_fanout_pos < 256) {
@@ -904,5 +914,95 @@ int verify_commit_graph(struct commit_graph *g)
cur_fanout_pos++;
}
+ if (verify_commit_graph_error)
+ return 1;
+
+ for (i = 0; i < g->num_commits; i++) {
+ struct commit *graph_commit, *odb_commit;
+ struct commit_list *graph_parents, *odb_parents;
+ int num_parents = 0;
+
+ hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);
+
+ graph_commit = lookup_commit(&cur_oid);
+ odb_commit = (struct commit *)create_object(cur_oid.hash, alloc_commit_node());
+ if (parse_commit_internal(odb_commit, 0, 0)) {
+ graph_report("failed to parse %s from object database", oid_to_hex(&cur_oid));
+ continue;
+ }
+
+ if (oidcmp(&get_commit_tree_in_graph_one(g, graph_commit)->object.oid,
+ get_commit_tree_oid(odb_commit)))
+ graph_report("root tree object ID for commit %s in commit-graph is %s != %s",
+ oid_to_hex(&cur_oid),
+ oid_to_hex(get_commit_tree_oid(graph_commit)),
+ oid_to_hex(get_commit_tree_oid(odb_commit)));
+
+ if (graph_commit->date != odb_commit->date)
+ graph_report("commit date for commit %s in commit-graph is %"PRItime" != %"PRItime"",
+ oid_to_hex(&cur_oid),
+ graph_commit->date,
+ odb_commit->date);
+
+
+ graph_parents = graph_commit->parents;
+ odb_parents = odb_commit->parents;
+
+ while (graph_parents) {
+ num_parents++;
+
+ if (odb_parents == NULL)
+ graph_report("commit-graph parent list for commit %s is too long (%d)",
+ oid_to_hex(&cur_oid),
+ num_parents);
+
+ if (oidcmp(&graph_parents->item->object.oid, &odb_parents->item->object.oid))
+ graph_report("commit-graph parent for %s is %s != %s",
+ oid_to_hex(&cur_oid),
+ oid_to_hex(&graph_parents->item->object.oid),
+ oid_to_hex(&odb_parents->item->object.oid));
+
+ graph_parents = graph_parents->next;
+ odb_parents = odb_parents->next;
+ }
+
+ if (odb_parents != NULL)
+ graph_report("commit-graph parent list for commit %s terminates early",
+ oid_to_hex(&cur_oid));
+
+ if (graph_commit->generation) {
+ uint32_t max_generation = 0;
+ graph_parents = graph_commit->parents;
+
+ while (graph_parents) {
+ if (graph_parents->item->generation == GENERATION_NUMBER_ZERO ||
+ graph_parents->item->generation == GENERATION_NUMBER_INFINITY)
+ graph_report("commit-graph has valid generation for %s but not its parent, %s",
+ oid_to_hex(&cur_oid),
+ oid_to_hex(&graph_parents->item->object.oid));
+ if (graph_parents->item->generation > max_generation)
+ max_generation = graph_parents->item->generation;
+ graph_parents = graph_parents->next;
+ }
+
+ if (max_generation == GENERATION_NUMBER_MAX)
+ max_generation--;
+
+ if (graph_commit->generation != max_generation + 1)
+ graph_report("commit-graph has incorrect generation for %s",
+ oid_to_hex(&cur_oid));
+ } else {
+ graph_parents = graph_commit->parents;
+
+ while (graph_parents) {
+ if (graph_parents->item->generation)
+ graph_report("commit-graph has generation ZERO for %s but not its parent, %s",
+ oid_to_hex(&cur_oid),
+ oid_to_hex(&graph_parents->item->object.oid));
+ graph_parents = graph_parents->next;
+ }
+ }
+ }
+
return verify_commit_graph_error;
}
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index 6fb306b0da..5ab268a024 100755
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -235,8 +235,15 @@ test_expect_success 'perform fast-forward merge in full repo' '
test_cmp expect output
'
+# the verify tests below expect the commit-graph to contain all
+# commits from the 'full' repo to be in the commit-graph file.
+# If the file changes the set of commits in the list, then the
+# offsets into the binary file will result in different edits
+# and the tests will likely break.
+
test_expect_success 'git commit-graph verify' '
cd "$TRASH_DIRECTORY/full" &&
+ git show-ref -s | git commit-graph write --stdin-commits &&
git commit-graph verify >output
'
@@ -324,4 +331,61 @@ test_expect_success 'detect incorrect OID order' '
grep "incorrect oid order" err
'
+test_expect_success 'detect OID not in object database' '
+ cd "$TRASH_DIRECTORY/full" &&
+ cp $objdir/info/commit-graph commit-graph-backup &&
+ test_when_finished mv commit-graph-backup $objdir/info/commit-graph &&
+ corrupt_data $objdir/info/commit-graph 1134 "\01" &&
+ test_must_fail git commit-graph verify 2>err &&
+ grep -v "^\+" err > verify-errors &&
+ test_line_count = 3 verify-errors &&
+ grep "Could not read" verify-errors &&
+ grep "parent" verify-errors &&
+ grep "from object database" verify-errors
+'
+
+test_expect_success 'detect incorrect tree OID' '
+ cd "$TRASH_DIRECTORY/full" &&
+ cp $objdir/info/commit-graph commit-graph-backup &&
+ test_when_finished mv commit-graph-backup $objdir/info/commit-graph &&
+ corrupt_data $objdir/info/commit-graph 1312 "\01" &&
+ test_must_fail git commit-graph verify 2>err &&
+ grep -v "^\+" err > verify-errors &&
+ test_line_count = 1 verify-errors &&
+ grep "root tree object ID for commit " verify-errors
+'
+
+test_expect_success 'detect incorrect parent id' '
+ cd "$TRASH_DIRECTORY/full" &&
+ cp $objdir/info/commit-graph commit-graph-backup &&
+ test_when_finished mv commit-graph-backup $objdir/info/commit-graph &&
+ corrupt_data $objdir/info/commit-graph 1332 "\01" &&
+ test_must_fail git commit-graph verify 2>err &&
+ grep -v "^\+" err > verify-errors &&
+ test_line_count = 1 verify-errors &&
+ grep "parent " verify-errors
+'
+
+test_expect_success 'detect incorrect parent id in large edges' '
+ cd "$TRASH_DIRECTORY/full" &&
+ cp $objdir/info/commit-graph commit-graph-backup &&
+ test_when_finished mv commit-graph-backup $objdir/info/commit-graph &&
+ corrupt_data $objdir/info/commit-graph 1712 "\01" &&
+ test_must_fail git commit-graph verify 2>err &&
+ grep -v "^\+" err > verify-errors &&
+ test_line_count = 1 verify-errors &&
+ grep "parent " verify-errors
+'
+
+test_expect_success 'detect incorrect commit date and generation number' '
+ cd "$TRASH_DIRECTORY/full" &&
+ cp $objdir/info/commit-graph commit-graph-backup &&
+ test_when_finished mv commit-graph-backup $objdir/info/commit-graph &&
+ corrupt_data $objdir/info/commit-graph 1340 "\01" &&
+ corrupt_data $objdir/info/commit-graph 1344 "\01" &&
+ test_must_fail git commit-graph verify 2>err &&
+ grep "incorrect generation" err &&
+ grep "commit date" err
+'
+
test_done
--
2.16.2.329.gfb62395de6
