Merge "Delta compression: reuse DeltaTask.getAdjustedWeight()"

org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaTask.java

@@ -226,7 +226,7 @@ final class DeltaTask implements Callable<Object> {
 		}
 	}
 
-	private static int getAdjustedWeight(ObjectToPack o) {
+	static int getAdjustedWeight(ObjectToPack o) {
 		// Edge objects and those with reused deltas do not need to be
 		// compressed. For compression calculations, ignore their weights.
 		if (o.isEdge() || o.doNotAttemptDelta()) {

org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java

@@ -1306,8 +1306,7 @@ public class PackWriter implements AutoCloseable {
 		long totalWeight = 0;
 		for (int i = 0; i < cnt; i++) {
 			ObjectToPack o = list[i];
-			if (!o.isEdge() && !o.doNotAttemptDelta())
+			totalWeight += DeltaTask.getAdjustedWeight(o);
-				totalWeight += o.getWeight();
 		}
 
 		long bytesPerUnit = 1;