Merge "Fix reading past FileTreeIterator EOF in FileTreeIteratorJava7Test"

This commit is contained in:
Robin Rosenberg 2014-05-24 06:10:33 -04:00 committed by Gerrit Code Review @ Eclipse.org
commit 527f5fc5d0
1 changed files with 0 additions and 3 deletions

View File

@ -107,7 +107,6 @@ public void apply(DirCacheEntry ent) {
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 void apply(DirCacheEntry ent) {
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 void apply(DirCacheEntry ent) {
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());