diff options
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java index 86669f6b39..63da518795 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java @@ -410,7 +410,6 @@ class PackWriterBitmapPreparer { rw.markStart(rc); BitmapBuilder bitmap = commitBitmapIndex.newBitmapBuilder(); - bitmap.or(reuse); bitmap.addObject(rc, Constants.OBJ_COMMIT); tipCommitBitmaps.add(new BitmapBuilderEntry(rc, bitmap)); } @@ -430,19 +429,15 @@ class PackWriterBitmapPreparer { continue; } for (RevCommit c : rc.getParents()) { + if (reuse.contains(c)) { + continue; + } bitmap.addObject(c, Constants.OBJ_COMMIT); } } pm.update(1); } - // Remove the reused bitmaps from the tip commit bitmaps - if (!reuseCommits.isEmpty()) { - for (BitmapBuilderEntry entry : tipCommitBitmaps) { - entry.getBuilder().andNot(reuse); - } - } - // Sort the tip commit bitmaps. Find the one containing the most // commits, remove those commits from the remaining bitmaps, resort and // repeat. |