diff options
| author | Chris Aniszczyk <caniszczyk@gmail.com> | 2011-02-24 11:23:47 -0500 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2011-02-24 11:23:47 -0500 |
| commit | 7e1f18c07990cfbb97e621bbfb25d80752add00c (patch) | |
| tree | 552ad5e976dbe07dff1c2a8746c47e6d4ef695d5 /org.eclipse.jgit | |
| parent | 2c9a1925053bae5c277bd2c34259ab15f1347493 (diff) | |
| parent | e757975fcd3101f071fdbcfccfbd722f3c551b9c (diff) | |
| download | jgit-7e1f18c07990cfbb97e621bbfb25d80752add00c.tar.gz jgit-7e1f18c07990cfbb97e621bbfb25d80752add00c.zip | |
Merge "RevWalk: Don't release during inMergeBase()"
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/revwalk/MergeBaseGenerator.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/MergeBaseGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/MergeBaseGenerator.java index 735f7d6023..3942ab2b70 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/MergeBaseGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/MergeBaseGenerator.java @@ -138,7 +138,6 @@ class MergeBaseGenerator extends Generator { final RevCommit c = pending.next(); if (c == null) { walker.reader.walkAdviceEnd(); - walker.reader.release(); return null; } |