From c9707e6353617f86cc75a7692797e1ed45e47cd3 Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Fri, 12 Apr 2013 12:59:02 -0700 Subject: Always attempt delta compression when reuseDeltas is false If reuseObjects=true but reuseDeltas=false the caller wants attempt a delta for every object in the input list. Test for reuseDeltas to ensure every object passes through the searchInWindow() method. If no delta is possible for an object and it will be stored whole (non-delta format), PackWriter may still reuse its content from any source pack. This avoids an inflate()-deflate() cycle to recompress the object contents. Change-Id: I845caeded419ef4551ef1c85787dd5ffd73235d9 --- .../src/org/eclipse/jgit/internal/storage/pack/PackWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java index 2e6812c1c7..54a5826c01 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java @@ -1996,7 +1996,7 @@ public class PackWriter { otp.clearReuseAsIs(); } - otp.setDeltaAttempted(next.wasDeltaAttempted()); + otp.setDeltaAttempted(reuseDeltas & next.wasDeltaAttempted()); otp.select(next); } -- cgit v1.2.3