Browse Source

Merge "Fix reading past FileTreeIterator EOF in FileTreeIteratorJava7Test"

stable-3.5
Robin Rosenberg 11 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
527f5fc5d0
  1. 3
      org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java

3
org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java

@ -107,7 +107,6 @@ public class FileTreeIteratorJava7Test extends RepositoryTestCase {
new Git(db).reset().setMode(ResetType.HARD).call();
DirCacheIterator dci = new DirCacheIterator(db.readDirCache());
FileTreeIterator fti = new FileTreeIterator(db);
fti.next(1); // Skips .git
// self-check
assertEquals("link", fti.getEntryPathString());
@ -147,7 +146,6 @@ public class FileTreeIteratorJava7Test extends RepositoryTestCase {
new Git(db).reset().setMode(ResetType.HARD).call();
DirCacheIterator dci = new DirCacheIterator(db.readDirCache());
FileTreeIterator fti = new FileTreeIterator(db);
fti.next(1); // Skips .git
// self-check
assertEquals("link", fti.getEntryPathString());
@ -189,7 +187,6 @@ public class FileTreeIteratorJava7Test extends RepositoryTestCase {
FS.DETECTED.createSymLink(new File(trash, "link"), "newtarget");
DirCacheIterator dci = new DirCacheIterator(db.readDirCache());
FileTreeIterator fti = new FileTreeIterator(db);
fti.next(1); // Skips .git
// self-check
assertEquals("link", fti.getEntryPathString());

Loading…
Cancel
Save