diff options
author | Derrick Stolee <dstolee@microsoft.com> | 2018-05-01 12:47:11 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-22 12:36:34 +0900 |
commit | 3afc679b3c13d99e4f02bceb686f11d51576d3ae (patch) | |
tree | 74add9b002a7fa5dca0177708b6c8a6dc7b17ad7 /t/t3400-rebase.sh | |
parent | commit-graph: compute generation numbers (diff) | |
download | tgif-3afc679b3c13d99e4f02bceb686f11d51576d3ae.tar.xz |
commit: use generations in paint_down_to_common()
Define compare_commits_by_gen_then_commit_date(), which uses generation
numbers as a primary comparison and commit date to break ties (or as a
comparison when both commits do not have computed generation numbers).
Since the commit-graph file is closed under reachability, we know that
all commits in the file have generation at most GENERATION_NUMBER_MAX
which is less than GENERATION_NUMBER_INFINITY.
This change does not affect the number of commits that are walked during
the execution of paint_down_to_common(), only the order that those
commits are inspected. In the case that commit dates violate topological
order (i.e. a parent is "newer" than a child), the previous code could
walk a commit twice: if a commit is reached with the PARENT1 bit, but
later is re-visited with the PARENT2 bit, then that PARENT2 bit must be
propagated to its parents. Using generation numbers avoids this extra
effort, even if it is somewhat rare.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3400-rebase.sh')
0 files changed, 0 insertions, 0 deletions