]> git.ipfire.org Git - thirdparty/git.git/commit
t/t5333-pseudo-merge-bitmaps.sh: demonstrate empty pseudo-merge groups
authorTaylor Blau <me@ttaylorr.com>
Thu, 15 Aug 2024 17:31:14 +0000 (13:31 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Aug 2024 18:26:35 +0000 (11:26 -0700)
commit42f80e361c59b7afc0258e44299fa0263c4cfbaf
tree66d33b0b9eb08c4a34ecdc7becdb349f2641b8e3
parent187504f9b2b2af89c77247100b246a704c68c884
t/t5333-pseudo-merge-bitmaps.sh: demonstrate empty pseudo-merge groups

Demonstrate that it is possible to generate empty pseudo-merge commits
in certain cases.

In the below instance, we generate one non-empty pseudo-merge
(containing commit "base"), and one empty pseudo-merge group
(corresponding to the unstable commits within that group).

(In my testing, the pseudo-merge machinery seems to handle empty groups
just fine, but generating them is pointless as they carry no
information.)

This commit (introducing a deliberate "test_expect_failure") is split
out from the actual fix (which will appear in the following commit) to
demonstrate that the failure is correctly induced.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5333-pseudo-merge-bitmaps.sh