RevWalk: Don't release during inMergeBase()

In bc1af8459e ("RevWalk: Don't reset ObjectReader when stopping") we
stopped releasing the reader when the current log traversal is over.
This should have also been applied to the merge base logic that is
buried within MergeGenerator, but got missed.

Change-Id: I8328f43f02cba06fd545e22134872e781b9d4d36
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

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 735f7d6023f32e8e22fb7b59ccfca996bb7200de..3942ab2b70513ac91e45ed29ede2d1e6cd9f67d1 100644 (file)
--- 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;
                        }