motiejus
/
jgit
1
Fork 0
Code Releases Activity

Use only a single ObjectInserter in ResolveMerger 

The base class supplies an ObjectInserter to its implementations
by way of the getObjectInserter method. Tracking a second inserter
instance doesn't match with the expected behavior.

Change-Id: I78996bd06ef9028c8aa2e4e192ff647c43da847d
This commit is contained in:
Shawn O. Pearce 2012-06-14 18:43:40 -07:00
parent 90f984c71f
commit b3dbf1981b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -131,8 +131,6 @@ public enum MergeFailureReason {
private Map<String, MergeFailureReason> failingPaths = new HashMap<String, MergeFailureReason>();
private ObjectInserter oi;
private boolean enterSubtree;
private boolean inCore;
@ -155,7 +153,6 @@ protected ResolveMerger(Repository local, boolean inCore) {
SupportedAlgorithm.HISTOGRAM);
mergeAlgorithm = new MergeAlgorithm(DiffAlgorithm.getAlgorithm(diffAlg));
commitNames = new String[] { "BASE", "OURS", "THEIRS" };
oi = getObjectInserter();
this.inCore = inCore;
if (inCore) {
@ -226,7 +223,7 @@ protected boolean mergeImpl() throws IOException {
}
if (getUnmergedPaths().isEmpty()) {
resultTree = dircache.writeTree(oi);
resultTree = dircache.writeTree(getObjectInserter());
return true;
} else {
resultTree = null;
@ -624,7 +621,8 @@ private void updateIndex(CanonicalTreeParser base,
dce.setLength((int) of.length());
InputStream is = new FileInputStream(of);
try {
dce.setObjectId(oi.insert(Constants.OBJ_BLOB, of.length(), is));
dce.setObjectId(getObjectInserter().insert(
Constants.OBJ_BLOB, of.length(), is));
} finally {
is.close();
if (inCore)