aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg@dewire.com>2014-05-24 06:10:33 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2014-05-24 06:10:33 -0400
commit527f5fc5d019d60fca3c0b8c7269f2a0bca91b69 (patch)
tree0368dfab678c6fdf31d24abdeda3030f0c6cd785
parent44f81d956b3036804d011e7d99769fbd904d5082 (diff)
parentde20148f846bdcf90358bb78557997afd717fb2b (diff)
downloadjgit-527f5fc5d019d60fca3c0b8c7269f2a0bca91b69.tar.gz
jgit-527f5fc5d019d60fca3c0b8c7269f2a0bca91b69.zip
Merge "Fix reading past FileTreeIterator EOF in FileTreeIteratorJava7Test"
-rw-r--r--org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java b/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java
index 2b2d65e9b1..2ed56463bd 100644
--- a/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/treewalk/FileTreeIteratorJava7Test.java
+++ b/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());