diff options
| author | Shawn Pearce <sop@google.com> | 2012-10-25 17:55:22 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2012-10-25 17:55:22 -0400 |
| commit | 4e6e267b8a8f9d9ef44b61adfdcba7e6ce1023f5 (patch) | |
| tree | b332029e09e3bcaf13240c12a4be2d7605214a59 /org.eclipse.jgit | |
| parent | cd61e85fa1c78b2f0f9d62fb7bb785cc7af45c4b (diff) | |
| parent | 45edb41a9ed1248964cb4bf0d635f2643406d123 (diff) | |
| download | jgit-4e6e267b8a8f9d9ef44b61adfdcba7e6ce1023f5.tar.gz jgit-4e6e267b8a8f9d9ef44b61adfdcba7e6ce1023f5.zip | |
Merge "Fix for Iff768422c, use offset 0 when going back to work tree iterator"
Diffstat (limited to 'org.eclipse.jgit')
| -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) { |