Browse Source

Merge "Reset internal state canonical length in WorkingTreeIterator when moving"

stable-3.3
Matthias Sohn 11 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
08fd639c0d
  1. 15
      org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java
  2. 2
      org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java

15
org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java

@ -56,9 +56,9 @@ import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheCheckout;
import org.eclipse.jgit.dircache.DirCacheEditor;
import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
import org.eclipse.jgit.dircache.DirCacheEntry;
import org.eclipse.jgit.dircache.DirCacheIterator;
import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
import org.eclipse.jgit.errors.CorruptObjectException;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
@ -98,6 +98,19 @@ public class FileTreeIteratorTest extends RepositoryTestCase {
}
}
@Test
public void testGetEntryContentLength() throws Exception {
final FileTreeIterator fti = new FileTreeIterator(db);
fti.next(1);
assertEquals(3, fti.getEntryContentLength());
fti.back(1);
assertEquals(2, fti.getEntryContentLength());
fti.next(1);
assertEquals(3, fti.getEntryContentLength());
fti.reset();
assertEquals(2, fti.getEntryContentLength());
}
@Test
public void testEmptyIfRootIsFile() throws Exception {
final File r = new File(trash, paths[0]);

2
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java

@ -465,7 +465,6 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
public void next(final int delta) throws CorruptObjectException {
ptr += delta;
if (!eof()) {
canonLen = -1;
parseEntry();
}
}
@ -484,6 +483,7 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
ensurePathCapacity(pathOffset + nameLen, pathOffset);
System.arraycopy(e.encodedName, 0, path, pathOffset, nameLen);
pathLen = pathOffset + nameLen;
canonLen = -1;
}
/**

Loading…
Cancel
Save