Merge "Ensure the ObjectInserter flushes after a merge"

13 years ago · 9f81c6813a
1 changed files with 4 additions and 1 deletions
--- 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();