diff options
| -rw-r--r-- | pack-bitmap.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c index 4086277de8..1d1e1a65ca 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -1082,10 +1082,15 @@ static unsigned apply_pseudo_merges_for_commit_1(struct bitmap_index *bitmap_git struct commit *commit, 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, - result, commit, commit_pos); + while (curr) { + ret += apply_pseudo_merges_for_commit(&curr->pseudo_merges, + result, commit, + commit_pos); + curr = curr->base; + } if (ret) pseudo_merges_satisfied_nr += ret; |