]> source.dussan.org Git - jgit.git/commit
RevWalk: Don't release during inMergeBase() 82/2582/2
authorShawn O. Pearce <spearce@spearce.org>
Wed, 23 Feb 2011 20:00:25 +0000 (12:00 -0800)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 24 Feb 2011 14:55:25 +0000 (06:55 -0800)
commite757975fcd3101f071fdbcfccfbd722f3c551b9c
tree7c2478f47c40d3cdcf2ca5e081c56be9c4860503
parent7505b93546376d3d46976e3a81ea791ba6a265ce
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>
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/MergeBaseGenerator.java