From 6450d956bca2374696f5ad8a566db76546ec6573 Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Wed, 8 Feb 2017 15:34:00 -0800 Subject: [PATCH] Assume GC_REST and GC_TXN also attempted deltas during packing In a DFS repository the DfsGarbageCollector will typically attempt delta compression while creating the three main pack files: GC, GC_REST and GC_TXN. Include all of these in the wasDeltaAttempted() decision so that future packers can bypass delta compression of non-delta objects. Change-Id: Ic2330c69fab0c494b920b4df0a290f3c2e1a03d7 --- .../internal/storage/dfs/DfsObjectRepresentation.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjectRepresentation.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjectRepresentation.java index 7edae88110..ddcfff6082 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjectRepresentation.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjectRepresentation.java @@ -43,8 +43,6 @@ package org.eclipse.jgit.internal.storage.dfs; -import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC; - import org.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation; import org.eclipse.jgit.lib.ObjectId; @@ -76,6 +74,13 @@ class DfsObjectRepresentation extends StoredObjectRepresentation { @Override public boolean wasDeltaAttempted() { - return pack.getPackDescription().getPackSource() == GC; + switch (pack.getPackDescription().getPackSource()) { + case GC: + case GC_REST: + case GC_TXN: + return true; + default: + return false; + } } } -- 2.39.5