]> Kevux Git Server - rit/commit
commit-graph: fix ordering bug in generation numbers
authorDerrick Stolee <derrickstolee@github.com>
Tue, 1 Mar 2022 19:48:30 +0000 (19:48 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Mar 2022 20:14:57 +0000 (12:14 -0800)
commit75979d94607d92d53b1cad5d65f20594c66d275c
tree2d5b0849bd5e208144bf9f127e768a53a3d66a7f
parent17925e0602983b1a1dbdd418c2fc2c70ca5faf5b
commit-graph: fix ordering bug in generation numbers

When computing the generation numbers for a commit-graph, we compute
the corrected commit dates and then check if their offsets from the
actual dates is too large to fit in the 32-bit Generation Data chunk.
However, there is a problem with this approach: if we have parsed the
generation data from the previous commit-graph, then we continue the
loop because the corrected commit date is already computed. This causes
an under-count in the number of overflow values.

It is incorrect to add an increment to num_generation_data_overflows
next to this 'continue' statement, because we might start
double-counting commits that are computed because of the depth-first
search walk from a commit with an earlier OID.

Instead, iterate over the full commit list at the end, checking the
offsets to see how many grow beyond the maximum value.

Create a new t5328-commit-graph-64-bit-time.sh test script to handle
special cases of testing 64-bit timestamps. This helps demonstrate this
bug in more cases. It still won't hit all potential cases until the next
change, which reenables reading generation numbers. Use the skip_all
trick from 0a2bfccb9c8 (t0051: use "skip_all" under !MINGW in
single-test file, 2022-02-04) to make the output clean when run on a
32-bit system.

Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit-graph.c
t/t5318-commit-graph.sh
t/t5328-commit-graph-64bit-time.sh [new file with mode: 0755]