From e757975fcd3101f071fdbcfccfbd722f3c551b9c Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 23 Feb 2011 12:00:25 -0800 Subject: [PATCH] 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 --- .../src/org/eclipse/jgit/revwalk/MergeBaseGenerator.java | 1 - 1 file changed, 1 deletion(-) 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 735f7d602..3942ab2b7 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; }