diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2012-10-06 13:08:16 +0200 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2012-10-06 13:08:16 +0200 |
| commit | 45edb41a9ed1248964cb4bf0d635f2643406d123 (patch) | |
| tree | 2dbd5344d2cd59dc5ea3755b95d940a7207e120f /org.eclipse.jgit/src/org/eclipse | |
| parent | 046a497d7774193c019d53fecc64d0a4b2e7d929 (diff) | |
| download | jgit-45edb41a9ed1248964cb4bf0d635f2643406d123.tar.gz jgit-45edb41a9ed1248964cb4bf0d635f2643406d123.zip | |
Fix for Iff768422c, use offset 0 when going back to work tree iterator
In Iff768422c the offset used for the content id was fixed to use the
offset that applied to the dircache iterator. Unfortunately the index
for the dircache content id offset stuck for entries that were not in
the index. Few caller probably cared about that, unless it actually
caused an ArrayIndexOutOfBoundsException.
Change-Id: Ic9f0e77c8ea3a0770d88565e94392e76853e3006
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java | 2 |
1 files changed, 2 insertions, 0 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 8d0555bf95..9ee5f8b11d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java @@ -243,6 +243,8 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator { return contentId = i.idBuffer(); } contentIdOffset = 0; + } else { + contentIdOffset = 0; } } switch (mode & FileMode.TYPE_MASK) { |