admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pack-bitmap.c: apply pseudo-merge commits with incremental MIDXs

Browse Source 
Prepare for using pseudo-merges with incremental MIDX bitmaps by
attempting to apply pseudo-merges from each layer when encountering a
given commit during a walk.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Acked-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau
2025-03-20 13:56:56 -04:00
committed by Junio C Hamano
parent db17e777c8
commit e2837e29e6
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pack-bitmap.c
View File

@@ -1082,10 +1082,15 @@ static unsigned apply_pseudo_merges_for_commit_1(struct bitmap_index *bitmap_git
struct commit *commit, struct commit *commit,
uint32_t commit_pos) uint32_t commit_pos)
{ {
int ret; struct bitmap_index *curr = bitmap_git;
int ret = 0;
ret = apply_pseudo_merges_for_commit(&bitmap_git->pseudo_merges, while (curr) {
result, commit, commit_pos); ret += apply_pseudo_merges_for_commit(&curr->pseudo_merges,
result, commit,
commit_pos);
curr = curr->base;
}
if (ret) if (ret)
pseudo_merges_satisfied_nr += ret; pseudo_merges_satisfied_nr += ret;