Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
index 55ac999cd4..e47192bddb 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
@@ -153,7 +153,10 @@ public abstract class Merger {
sourceTrees[i] = walk.parseTree(sourceObjects[i]);
try {
- return mergeImpl();
+ boolean ok = mergeImpl();
+ if (ok && inserter != null)
+ inserter.flush();
+ return ok;
} finally {
if (inserter != null)
inserter.release();

Back to the top