diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2014-02-04 03:03:27 -0500 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2014-02-04 03:03:27 -0500 |
| commit | 08fd639c0d8fd1aebf96106b1d2ad67818c7ebd9 (patch) | |
| tree | 14853d46aed878fe55bf037c3464a01be8330d8a /org.eclipse.jgit/src | |
| parent | 8ae6295007f5247ba90e67bc86875cfecd082756 (diff) | |
| parent | 871ee53b52a7e7f6a0fe600a054ec78f8e4bff5a (diff) | |
| download | jgit-08fd639c0d8fd1aebf96106b1d2ad67818c7ebd9.tar.gz jgit-08fd639c0d8fd1aebf96106b1d2ad67818c7ebd9.zip | |
Merge "Reset internal state canonical length in WorkingTreeIterator when moving"
Diffstat (limited to 'org.eclipse.jgit/src')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java index 280f64f4f0..14c53dd100 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java +++ b/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; } /** |