]> git.ipfire.org Git - thirdparty/git.git/commit
t6099, t6600: add side-exhaustion regression tests
authorKristofer Karlsson <krka@spotify.com>
Sat, 11 Jul 2026 13:27:39 +0000 (13:27 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 11 Jul 2026 21:00:11 +0000 (14:00 -0700)
commit0789dc8f046c017e1dc69bb720a7b425aa8a1292
treef706147e46fa83834c324b751b03ad046070e4f3
parent6e1730e22b121280ba6b7e1a25e84d53cca41a78
t6099, t6600: add side-exhaustion regression tests

Add t6099 to test the case where multiple merge-base candidates exist
and one is an ancestor of another. This exercises the side-exhaustion
optimization in paint_down_to_common together with the
remove_redundant safety net in get_merge_bases_many_0.

Add a mixed finite/INFINITY test to t6600 where one tip is outside
the commit-graph (INFINITY generation) and the other is inside.
This exercises the region transition: the walk starts in the
INFINITY region where side-exhaustion is disabled, then crosses
into the finite region where it can fire.

Signed-off-by: Kristofer Karlsson <krka@spotify.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/meson.build
t/t6099-merge-base-side-exhaustion.sh [new file with mode: 0755]