diff options
| author | Kristofer Karlsson <krka@spotify.com> | 2026-06-29 13:19:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-06-29 10:40:35 -0700 |
| commit | 18cf52c8a590d00c333d3d20edc2cf8c11c8ab92 (patch) | |
| tree | 6e4f936869f0de915b86b19bf784e55e5f950502 /git-commit-script | |
| parent | 93e5b1680e30650ceca889a56429a055f17033bd (diff) | |
t6600: add test for merge-base early exit with clock skew
Add a topology where the correct merge base (M2) has a lower
committer date than its ancestor (M1) due to clock skew. With a
v1 commit graph (topological levels only, no corrected commit
dates), paint_down_to_common() falls back to commit-date ordering.
In that mode, M1 pops before M2, acquires both paint sides, and
the !FIND_ALL early exit fires -- returning the wrong merge base.
Mark the test as test_expect_failure to document the bug; the next
commit will fix it.
Signed-off-by: Kristofer Karlsson <krka@spotify.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-commit-script')
0 files changed, 0 insertions, 0 deletions
