]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 42f80e3) | patch
pseudo-merge.c: do not generate empty pseudo-merge commits
authorTaylor Blau <me@ttaylorr.com>
Thu, 15 Aug 2024 17:31:17 +0000 (13:31 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Aug 2024 18:29:15 +0000 (11:29 -0700)
commit25b78668de62ac2f503ee5957e174474bd51ae6c
treea22ab1b81e3e6f088695ce266c5e0b791e9699c2tree
parent42f80e361c59b7afc0258e44299fa0263c4cfbafcommit | diff
pseudo-merge.c: do not generate empty pseudo-merge commits

The previous commit demonstrated it is possible to generate empty
pseudo-merge commits, which is not useful as such pseudo-merges carry no
information.

Ensure that we only generate non-empty groups by not pushing a new
commit onto the bitmap_writer when that commit has no parents.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
pseudo-merge.c diff | blob | blame | history
t/t5333-pseudo-merge-bitmaps.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.