Skip to content

Commit fbcc540

Browse files
newrengitster
authored andcommitted
commit-graph: use timestamp_t for max parent generation accumulator
compute_reachable_generation_numbers() computes each commit's generation as max(c->date, max(parent.generation)) + 1 by walking its parents and accumulating their generations into a local uint32_t max_gen = 0; while info->get_generation() returns timestamp_t and compute_generation_from_max() already takes its max_gen parameter as timestamp_t. For v1 (topological levels) the narrowing is harmless because GENERATION_NUMBER_V1_MAX is less than 2^30, but for v2 (corrected committer dates) it silently truncates any parent generation that does not fit in 32 bits, i.e. any parent whose committer timestamp is at or beyond 2106-02-07 UTC (>= 2^32). The truncated max then causes child commits to end up with a corrected committer date that matches the parent's instead of being at least 1 higher. The bad value gets written into the commit-graph and causes problems later, and can be noticed by running `git commit-graph verify`. Widen the accumulator to timestamp_t. This is solely an in-memory arithmetic fix with no on-disk format change: the on-disk format already encodes timestamp_t values and existing readers handle them unchanged. This merely allows the code to compute the correct value to write to disk. The narrowing was introduced in 80c928d (commit-graph: simplify compute_generation_numbers(), 2023-03-20), which rewired v2 to use the shared compute_reachable_generation_numbers() helper; the helper's local accumulator had been declared uint32_t in the immediately preceding 368d19b (commit-graph: refactor compute_topological_levels(), 2023-03-20) when only v1 was using it, where it was harmless. Add a new test with a future-dated parent and a present-day child; without the above fix, `git commit-graph verify` reports the descendant's stored generation as below parent + 1. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9a2fb14 commit fbcc540

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

commit-graph.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1636,7 +1636,7 @@ static void compute_reachable_generation_numbers(
16361636
struct commit *current = list->item;
16371637
struct commit_list *parent;
16381638
int all_parents_computed = 1;
1639-
uint32_t max_gen = 0;
1639+
timestamp_t max_gen = 0;
16401640

16411641
for (parent = current->parents; parent; parent = parent->next) {
16421642
repo_parse_commit(info->r, parent->item);

t/t5328-commit-graph-64bit-time.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,15 @@ test_expect_success 'single commit with generation data exceeding UINT32_MAX' '
7474
git -C repo-uint32-max commit-graph verify
7575
'
7676

77+
test_expect_success 'descendant of commit with date exceeding UINT32_MAX' '
78+
git init repo-uint32-max-descendant &&
79+
test_commit -C repo-uint32-max-descendant \
80+
--date "@4294967300 +0000" future-parent &&
81+
test_commit -C repo-uint32-max-descendant present-day-child &&
82+
git -C repo-uint32-max-descendant commit-graph write --reachable &&
83+
git -C repo-uint32-max-descendant commit-graph verify
84+
'
85+
7786
test_expect_success PERL_TEST_HELPERS 'reader notices out-of-bounds generation overflow' '
7887
graph=.git/objects/info/commit-graph &&
7988
test_when_finished "rm -rf $graph" &&

0 commit comments

Comments
 (0)