Merge "Fix reading past FileTreeIterator EOF in FileTreeIteratorJava7Test"
This commit is contained in:
commit
527f5fc5d0
|
@ -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());
|
||||
|
|
Loading…
Reference in New Issue