Browse Source

Merge "Fix reading of ref names containing characters that sort before /"

stable-1.1
Robin Rosenberg 13 years ago committed by Code Review
parent
commit
5a3a2b53ee
  1. 30
      org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/RefDirectoryTest.java
  2. 11
      org.eclipse.jgit/src/org/eclipse/jgit/storage/file/RefDirectory.java

30
org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/RefDirectoryTest.java

@ -61,6 +61,9 @@ import java.io.File;
import java.io.IOException;
import java.util.Map;
import org.eclipse.jgit.events.ListenerHandle;
import org.eclipse.jgit.events.RefsChangedEvent;
import org.eclipse.jgit.events.RefsChangedListener;
import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.AnyObjectId;
@ -465,6 +468,33 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase {
assertEquals(B, refs.get("refs/heads/project1-B").getObjectId());
}
@Test
public void testGetRefs_LooseSorting_Bug_348834() throws IOException {
Map<String, Ref> refs;
writeLooseRef("refs/heads/my/a+b", A);
writeLooseRef("refs/heads/my/a/b/c", B);
final int[] count = new int[1];
ListenerHandle listener = Repository.getGlobalListenerList()
.addRefsChangedListener(new RefsChangedListener() {
public void onRefsChanged(RefsChangedEvent event) {
count[0]++;
}
});
refs = refdir.getRefs(RefDatabase.ALL);
refs = refdir.getRefs(RefDatabase.ALL);
listener.remove();
assertEquals(1, count[0]); // Bug 348834 multiple RefsChangedEvents
assertEquals(2, refs.size());
assertEquals(A, refs.get("refs/heads/my/a+b").getObjectId());
assertEquals(B, refs.get("refs/heads/my/a/b/c").getObjectId());
}
@Test
public void testGetRefs_TagsOnly_AllPacked() throws IOException {
Map<String, Ref> tags;

11
org.eclipse.jgit/src/org/eclipse/jgit/storage/file/RefDirectory.java

@ -385,10 +385,17 @@ public class RefDirectory extends RefDatabase {
if (entries == null) // not a directory or an I/O error
return false;
if (0 < entries.length) {
for (int i = 0; i < entries.length; ++i) {
String e = entries[i];
File f = new File(dir, e);
if (f.isDirectory())
entries[i] += '/';
}
Arrays.sort(entries);
for (String name : entries) {
File e = new File(dir, name);
if (!scanTree(prefix + name + '/', e))
if (name.charAt(name.length() - 1) == '/')
scanTree(prefix + name, new File(dir, name));
else
scanOne(prefix + name);
}
}

Loading…
Cancel
Save