From b24a61272a991373857f9d165db33dbd0170f43a Mon Sep 17 00:00:00 2001
From: Shawn O. Pearce
Date: Wed, 26 Oct 2011 14:42:51 -0700
Subject: Ensure the ObjectInserter flushes after a merge

If this does not happen some databases may discard
objects and not make them available.

Change-Id: I347b3c3724db52c8a6c09f4804071497a3a377ab
---
 org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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();
-- 
cgit v1.2.3