From 1eee0466ca9ac8dd04d7896f8e4aae3d7d31926f Mon Sep 17 00:00:00 2001
From: Terry Parker <tparker@google.com>
Date: Thu, 29 Oct 2015 11:02:01 -0700
Subject: [PATCH] Building bitmaps: Simplify the logic to sort by chains

Change-Id: I3da98e85107154c159093c138893f54dfa7ef435
Signed-off-by: Terry Parker <tparker@google.com>
---
 .../pack/PackWriterBitmapPreparer.java        | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 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 e250289bd..a58caa924 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
@@ -269,30 +269,23 @@ Collection<BitmapCommit> selectCommits(int expectedCommitCount)
 					// selected commit to fullBitmap.
 				}
 
-				// Sort the commits by independent chains in its history,
-				// yielding better compression when building bitmaps.
-				List<List<BitmapCommit>> candidateChain = new ArrayList<
-						List<BitmapCommit>>();
+				// Sort the commits by independent chains in this branch's
+				// history, yielding better compression when building bitmaps.
+				List<BitmapCommit> longestAncestorChain = null;
 				for (List<BitmapCommit> chain : chains) {
 					BitmapCommit mostRecentCommit = chain.get(chain.size() - 1);
 					if (fullBitmap.contains(mostRecentCommit)) {
-						candidateChain.add(chain);
-					}
-				}
-
-				List<BitmapCommit> longestAncestorChain;
-				if (candidateChain.isEmpty()) {
-					longestAncestorChain = new ArrayList<BitmapCommit>();
-					chains.add(longestAncestorChain);
-				} else {
-					longestAncestorChain = candidateChain.get(0);
-					// Append to longest
-					for (List<BitmapCommit> chain : candidateChain) {
-						if (chain.size() > longestAncestorChain.size()) {
+						if (longestAncestorChain == null
+								|| longestAncestorChain.size() < chain.size()) {
 							longestAncestorChain = chain;
 						}
 					}
 				}
+
+				if (longestAncestorChain == null) {
+					longestAncestorChain = new ArrayList<BitmapCommit>();
+					chains.add(longestAncestorChain);
+				}
 				longestAncestorChain.add(new BitmapCommit(
 						c, !longestAncestorChain.isEmpty(), flags));
 				writeBitmaps.addBitmap(c, fullBitmap, 0);