Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce2011-04-21 19:40:26 +0000
committerShawn O. Pearce2011-04-21 19:40:26 +0000
commit33e65ec6911795cf2816af1f64b5699dd898d59f (patch)
tree63dc9c9d494f5d838eb74c0ee020563c04f23b0c
parent502508f0286e07100e214fed5506ee20be5673dc (diff)
downloadjgit-33e65ec6911795cf2816af1f64b5699dd898d59f.tar.gz
jgit-33e65ec6911795cf2816af1f64b5699dd898d59f.tar.xz
jgit-33e65ec6911795cf2816af1f64b5699dd898d59f.zip
Fix sorting of names in RefDirectory
RefDirectory did not correctly follow the contract of RefList. The contract says if you use add() method of RefList builder, you MUST sort() it afterwards, and later every other method assumes that list is properly sorted (especially the binary search in the find() and get() methods). Instead RefDirectory class tried to scan the refs recursively while sorting every folder in the process before processing and did not call sort(). For example, when scanning the contents of refs/tags project1 string is smaller than project1-*, so it will recursively go into the folder and add these tags first and only then will add project-* ones. This will result in a broken list (any project1-* string is less than project1/* one, but they all appear after them in the list), that's why binary search will fail making loose RefList and the whole local RefMap completely unusable. Change-Id: Ibad90017e3b2435b1396b69a22520db4b1b022bb Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/RefDirectoryTest.java13
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/storage/file/RefDirectory.java2
2 files changed, 15 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/RefDirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/RefDirectoryTest.java
index a61580dd1f..56e5549b84 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/RefDirectoryTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/RefDirectoryTest.java
@@ -456,6 +456,19 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase {
}
@Test
+ public void testGetRefs_LooseSortedCorrectly() throws IOException {
+ Map<String, Ref> refs;
+
+ writeLooseRef("refs/heads/project1/A", A);
+ writeLooseRef("refs/heads/project1-B", B);
+
+ refs = refdir.getRefs(RefDatabase.ALL);
+ assertEquals(2, refs.size());
+ assertEquals(A, refs.get("refs/heads/project1/A").getObjectId());
+ assertEquals(B, refs.get("refs/heads/project1-B").getObjectId());
+ }
+
+ @Test
public void testGetRefs_TagsOnly_AllPacked() throws IOException {
Map<String, Ref> tags;
Ref a;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/RefDirectory.java
index bba634a6b6..cd199dcf92 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/RefDirectory.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/RefDirectory.java
@@ -288,6 +288,7 @@ public class RefDirectory extends RefDatabase {
RefList<LooseRef> loose;
if (scan.newLoose != null) {
+ scan.newLoose.sort();
loose = scan.newLoose.toRefList();
if (looseRefs.compareAndSet(oldLoose, loose))
modCnt.incrementAndGet();
@@ -312,6 +313,7 @@ public class RefDirectory extends RefDatabase {
loose = loose.remove(toRemove);
}
}
+ symbolic.sort();
return new RefMap(prefix, packed, upcast(loose), symbolic.toRefList());
}

Back to the top